fixed: event tracking