Yosemite bug workaround :-(