Add stop event propagation