fix for MIFOSX-818