Bug induced by the last commit removed