use better approach to fix eventbus concurrency issue