Fixing bug on