[JENKINS-18457] Fix events