MMS Fix

Change-Id: I7ef6746b076f063cbe26647adbb65ab33bcf12b0