Fixed tracer logic