diff --git a/.gas-snapshot b/.gas-snapshot
index c3263658..4493cd12 100644
--- a/.gas-snapshot
+++ b/.gas-snapshot
@@ -73,9 +73,9 @@ TestLoanCombinations:testLoan20For721SimpleInterestDutchFixedRepay() (gas: 58727
 TestLoanCombinations:testLoan20for20SimpleInterestDutchFixedRepay() (gas: 594461)
 TestLoanCombinations:testLoan721for20SimpleInterestDutchFixedRepay() (gas: 585469)
 TestLoanCombinations:testLoanAstariaSettlementRepay() (gas: 575374)
-TestNewLoan:testBuyNowPayLater() (gas: 2869909)
-TestNewLoan:testInvalidSenderBNPL() (gas: 1613720)
-TestNewLoan:testInvalidUserDataHashBNPL() (gas: 1616299)
+TestNewLoan:testBuyNowPayLater() (gas: 2869309)
+TestNewLoan:testInvalidSenderBNPL() (gas: 1613120)
+TestNewLoan:testInvalidUserDataHashBNPL() (gas: 1615699)
 TestNewLoan:testNewLoanAs1271ProxyAccountSender() (gas: 861457)
 TestNewLoan:testNewLoanAs1271ProxyAccountThirdPartyFiller() (gas: 871145)
 TestNewLoan:testNewLoanERC721CollateralDefaultTerms2() (gas: 424965)
diff --git a/src/BNPLHelper.sol b/src/BNPLHelper.sol
index c2e1ff31..53b4bddc 100644
--- a/src/BNPLHelper.sol
+++ b/src/BNPLHelper.sol
@@ -96,10 +96,10 @@ contract BNPLHelper is IFlashLoanRecipient {
             transfers[i] = AdditionalTransfer({
                 itemType: ItemType.ERC20,
                 identifier: 0,
-                token: tokens[0],
+                token: tokens[i],
                 from: execution.borrower,
                 to: vault,
-                amount: amounts[0] + feeAmounts[0]
+                amount: amounts[i] + feeAmounts[i]
             });
             unchecked {
                 ++i;