[TIMOB-16523] Fixed up event handling.