Fix for CVE-2015-7498