Fix for CVE-2015-8035