[M] Add MTP fix