fixed duplicate event issue