Ensured use of correct model in change handler