Implement suggested fix for CVE-2014-3566

[1] http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2014-3566