EventBroker bugfix