Fixed a change set bug in master entity