Fixed issue in Yosemite