Probably the fix to #80