Fix the tracing