MIFOSX-982 Issue Fix

Updated Fix
cleaning up commit for MIFOSX-982