fix for MIFOSX-884
Merge pull request #780 from vishwasbabu/develop

fix for MIFOSX-884