fix the defect MAGN-3343
Merge pull request #1624 from Zhengzi/Migration2

fix the defect MAGN-3343