Fixing bug with