Restoring OSX compatibility