Fix event propagation