Fix for CVE-2008-4474