Fix for CVE-2013-4239