Bugfixing in eventing