Fixed MIFOSX-551 issue
Merge pull request #462 from ashok-conflux/MIFOSX-551

Fixed MIFOSX-551 issue