fix event bus and clustering