Tracing bug fix