fixed event issues