Fix for blow-up on OSX/Yosemite.