Part 1 of a possible OSX fix