fix for MIFOSX-1615