MAGN-485 fix
Merge pull request #650 from ambarish-prakash/MAGN-485

MAGN-485 fix