Fixed a bug with the Model change event
Merging