fix some event  bugs