Tweaked MMCR handling.