fix for MIFOSX-884