Fix tracing