[MP] Trying OSX fix again.