fixed event removal issue