Fix for CVE-2012-3411