Loan Contracts; Account Roles may show incorrect numbering sequence

In Loan Contract Documents, where there are multiple Clients of the same Account Role the client is shown as "Borrower 1", "Borrower 2" etc.

However, only the first group of multiple Clients with the same Account Role show correctly.

For example, if there are two Borrowers and two Guarantors it was printing:

Borrower 1
Borrower 2
Guarantor 3
Guarantor 4