Fix for current OS X