fixed MIFOSX-301 issue

Hi Keith,

This commit includes fix to MIFOSX-301.

Regards
Ashok