Attempt fix for OS X crash