10.10 Patch. Temporary workaround.