Debug trace fix