MIFOSX-943,#743 fixed