fixed event-handler-call bug