Fix issue with OSX 10.10