fix for MIFOSX-396