fix for MIFOSX-474
Merge pull request #379 from vishwasbabu/bug-fix

fix for MIFOSX-474