Fix generic type for EventBus