Fix for Mac OS X