Investigate whether commmit 3c7e60b7 really fixes a bug