Fix for CVE-2015-0291