EventPublisher fix