Compatibility with OSX 10.10