Part 2 of a possible OSX fix