bug fix: MIFOSX-201 and MIFOSX-202