Fix property changed issue