Fix event tracking