fix for MIFOSX-396
Merge pull request #327 from vishwasbabu/harshac-MIFOSX69

fix for MIFOSX-396