Rolled back the fix to #80 as it influences #72