MIFOSX-307

fix issue MIFOSX-307