Fix for Mac OS X, again