fix event mess issue