OSX fix attempt 2