Fix microbug with event bubling