MMS Fix

Change-Id: I06678f2308ef8c8c3a355e0bd3c60e897642fe5f