initial work around MIFOSX-1634