Work on OSX as well