Fix a potential event disclosure issue