fix for MIFOSX-1019