Fix event bus