fix event issue