fix
Fully address CVE-2021-3121 in the process.
Signed-off-by: Mayank Shah <mayankshah1614@gmail.com>