Fix for CVE-2023-24329