Deferred fix + credits (beta)