Security fix for CVE-2021-4034