Security fix (20/22)

Security fix