#18 first attempt at fix for Yosemite