Fixed stupid fucking bug. New config-mm slightly modified and all relevant tests pass.