Fix event propagation problem