bugfixed: MM crash