Tenative fix for OSX support