moved waitgroup to EventBus field