Fix event triggering in broker