Fix event broadcast