Possible fix for OSX