Fixed MIFOSX-1406.8