Trace fix