Yes, that is correct. You would amend the prior year and carry forward the credit until it is all used.
@cymccorm
