MIFOSX-982 Issue Fix

Updated Fix