Fixed MIFOSX-1406.4