fix for MIFOSX-820