Security fix (19/22)

Security fix