Fix for CVE-2013-1962