Security fix for CVE-2021-38714