bug fix handling model changes