FIXED MIFSOX-1237,MIFOSX-1238