Fix for CVE-2012-4423