Fix MAGN-3140
Merge pull request #2140 from Randy-Ma/magn-3140

Fix MAGN-3140