Try fixing the tracing