Fix for CVE-2011-1146