Fix wrong event propagation