Fix bug in MMAS