Fix model change issue