Fixing #77