Fix for CVE-2015-5312