Can we put this part to a separate method since it's reused in propertyChanged()?