Fix to event tracking