Fixing bug (oops)