Finally fixed event tracking