Fixed MIFOSX-1382