Fix buggy commit b740507