Temporary workaround for OS X 10.10