Fix the event bubbling problem