Fixlet for CVE-2021-36934 workaround

@brolly33 has posted a community solution under this thread: