[PIR-950] Fixing event code