fixed event
fixed some event problems