Address CVE-2012-6652. Closes #623