fix for MIFOSX-822