fixed events firing twice