Another attempt at dealing with OSX...