Fixed Yosemite workaround.