Fix for CVE-2007-4572