Fix for MMS