diff --git a/package.json b/package.json
index 122bdbe..9c10b83 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@orionprotocol/sdk",
-  "version": "0.20.10-rc104",
+  "version": "0.20.10-rc105",
   "description": "Orion Protocol SDK",
   "main": "./lib/index.cjs",
   "module": "./lib/index.js",
diff --git a/src/Unit/Exchange/generateSwapCalldata.ts b/src/Unit/Exchange/generateSwapCalldata.ts
index bfdf259..d38df4e 100644
--- a/src/Unit/Exchange/generateSwapCalldata.ts
+++ b/src/Unit/Exchange/generateSwapCalldata.ts
@@ -101,7 +101,7 @@ export async function generateSwapCalldata({
     flags: 0,
   };
   const amountNativeDecimals = await exchangeToNativeDecimals(srcToken, amount, provider);
-  
+
   path = SafeArray.from(arrayLikePath).map((singleSwap) => {
     if (singleSwap.assetIn == ethers.ZeroAddress) singleSwap.assetIn = wethAddress;
     if (singleSwap.assetOut == ethers.ZeroAddress) singleSwap.assetOut = wethAddress;
@@ -131,7 +131,7 @@ export async function generateSwapCalldata({
     ));
   }
 
-  calls = await wrapOrUnwrapIfNeeded(amountNativeDecimals, swapDescription, calls);
+  ({ swapDescription, calls } = await wrapOrUnwrapIfNeeded(amountNativeDecimals, swapDescription, calls, swapExecutorContractAddress));
   const calldata = generateCalls(calls);
   return { swapDescription, calldata };
 }
@@ -247,9 +247,15 @@ async function processMultiFactorySwaps(
   return { swapDescription, calls };
 }
 
-async function wrapOrUnwrapIfNeeded(amount: BigNumberish, swapDescription: LibValidator.SwapDescriptionStruct, calls: BytesLike[]): Promise<BytesLike[]> {
+async function wrapOrUnwrapIfNeeded(
+  amount: BigNumberish,
+  swapDescription: LibValidator.SwapDescriptionStruct,
+  calls: BytesLike[],
+  swapExecutorContractAddress: string
+) {
   if (swapDescription.srcToken === ZeroAddress) {
-    const wrapCall = generateWrapAndTransferCall(swapDescription.dstReceiver, { value: amount });
+    const wrapCall = generateWrapAndTransferCall(swapDescription.srcReceiver, { value: amount });
+    swapDescription.srcReceiver = swapExecutorContractAddress
     calls = ([wrapCall] as BytesLike[]).concat(calls);
   }
   if (swapDescription.dstToken === ZeroAddress) {
@@ -261,5 +267,5 @@ async function wrapOrUnwrapIfNeeded(amount: BigNumberish, swapDescription: LibVa
     transferCall = pathCallWithBalance(transferCall, swapDescription.dstToken);
     calls.push(transferCall);
   }
-  return calls;
+  return { swapDescription, calls };
 }