SECURITY: Fix CVE-2013-6461