Fixing #74