fixed events propagation problems