fixed event tracking