Fixed regression on OSX