fix double events