[MP] Fix #472 for Linux/OSX