This should have been fixed with the release of 10.11