Fixed on OSX