Fixing bug introduced