Security fix (4/22)

Security fix