fix for MIFOSX-474