Security fix (8/22)

Security fix