Fix excessive event bubbling