Fixing #2