Fix for Yosemite