event propogation problem fix