Add workaround for Yosemite bug