Fix event issue