Fixing bug with setting