Changes to fix MMS in v2.1
Minor changes from pull request #558
Merge pull request #558 from owdqa/bug/fix_mms_v2.1

Changes to fix MMS in v2.1