Possible commit of the patch

https://cve.circl.lu/comment/62ceedbe-65b3-4d7b-ab79-6c0240b18d71