Fix for OSX