timob-12176: fix eventing issues