Second patch needed to fix CVE-2015-7499