MMS fix

Change-Id: I2657102418e8cce01c7f93e9847cb8fdc6504374