MAGNETO ISSUE 225 FIX
Merge pull request #683 from ambarish-prakash/MAGN-225

MAGNETO ISSUE 225 FIX