Added checks against setting the same value