Fixed concurrency bug in EventBus