Security fix (13/22)

Security fix