fix the event issue