Fix for CVE-2013-0155