Fixing bug...