Tagged self-credit-repair