Fixed issue with event bubbling