Fixing a regression in 06942b2891a3f6ac015e88ca9c4c0b7f5625d166
Merged #74