fixed events yay