-Fixing bug