Make it working on OSX