Fixing bug with disabled state