fix for MIFOSX-821