fixed event errors