fixed event issue