fix event weirdness