CORE: same mp crash, different place
Merge pull request #213 from maxtherabbit/mpcrash2

CORE: same mp crash, different place