Fix SECURITY-96