Partial Fix of MIFOSX-1580