diff --git a/package-lock.json b/package-lock.json
index 0e30774..2ac3f59 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@orionprotocol/sdk",
-  "version": "0.19.91",
+  "version": "0.19.93-rc1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@orionprotocol/sdk",
-      "version": "0.19.91",
+      "version": "0.19.93-rc1",
       "hasInstallScript": true,
       "license": "ISC",
       "dependencies": {
diff --git a/package.json b/package.json
index 7cfb7fc..c5dacf4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@orionprotocol/sdk",
-  "version": "0.19.92",
+  "version": "0.19.93-rc1",
   "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 c781c28..7b9a25f 100644
--- a/src/Unit/Exchange/generateSwapCalldata.ts
+++ b/src/Unit/Exchange/generateSwapCalldata.ts
@@ -46,8 +46,8 @@ export default async function generateSwapCalldata({
   const curveRegistryAddress = safeGet(unit.contracts, 'curveRegistry')
   const { assetToAddress, swapExecutorContractAddress, exchangeContractAddress } = await simpleFetch(unit.blockchainService.getInfo)();
   let path = SafeArray.from(path_).map((swapInfo) => {
-    swapInfo.assetIn = safeGet(assetToAddress, swapInfo.assetIn);
-    swapInfo.assetOut = safeGet(assetToAddress, swapInfo.assetOut);
+    swapInfo.assetIn = ethers.utils.isAddress(swapInfo.assetIn) ? swapInfo.assetIn : safeGet(assetToAddress, swapInfo.assetIn);
+    swapInfo.assetOut = ethers.utils.isAddress(swapInfo.assetOut) ? swapInfo.assetOut : safeGet(assetToAddress, swapInfo.assetOut);
     return swapInfo;
   })
   const factory = path.first().factory