Second and last fix for CVE-2015-7941