Fixed tracing implementation