Changes to fix MMS in v2.1

Yes, you're right