Fix for CVE-2014-0012