fixes for CVE-2011-4718