Fixed Mac OS X regression