diff --git a/.forge-snapshots/BaseActionsRouter_mock10commands.snap b/.forge-snapshots/BaseActionsRouter_mock10commands.snap
index 9bb19996..34a072bb 100644
--- a/.forge-snapshots/BaseActionsRouter_mock10commands.snap
+++ b/.forge-snapshots/BaseActionsRouter_mock10commands.snap
@@ -1 +1 @@
-62960
\ No newline at end of file
+61756
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_burn_empty.snap b/.forge-snapshots/PositionManager_burn_empty.snap
index eae5c224..05561cbe 100644
--- a/.forge-snapshots/PositionManager_burn_empty.snap
+++ b/.forge-snapshots/PositionManager_burn_empty.snap
@@ -1 +1 @@
-46761
\ No newline at end of file
+46767
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_burn_empty_native.snap b/.forge-snapshots/PositionManager_burn_empty_native.snap
index f4f42539..bd63bab0 100644
--- a/.forge-snapshots/PositionManager_burn_empty_native.snap
+++ b/.forge-snapshots/PositionManager_burn_empty_native.snap
@@ -1 +1 @@
-46579
\ No newline at end of file
+46584
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_burn_nonEmpty.snap b/.forge-snapshots/PositionManager_burn_nonEmpty.snap
index 774f434a..6bc4c749 100644
--- a/.forge-snapshots/PositionManager_burn_nonEmpty.snap
+++ b/.forge-snapshots/PositionManager_burn_nonEmpty.snap
@@ -1 +1 @@
-129621
\ No newline at end of file
+129412
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_burn_nonEmpty_native.snap b/.forge-snapshots/PositionManager_burn_nonEmpty_native.snap
index ae82b06d..256a4450 100644
--- a/.forge-snapshots/PositionManager_burn_nonEmpty_native.snap
+++ b/.forge-snapshots/PositionManager_burn_nonEmpty_native.snap
@@ -1 +1 @@
-122543
\ No newline at end of file
+122334
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_collect.snap b/.forge-snapshots/PositionManager_collect.snap
index 5f10760f..35c98376 100644
--- a/.forge-snapshots/PositionManager_collect.snap
+++ b/.forge-snapshots/PositionManager_collect.snap
@@ -1 +1 @@
-149718
\ No newline at end of file
+149447
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_collect_native.snap b/.forge-snapshots/PositionManager_collect_native.snap
index 7ca113a9..22674b5b 100644
--- a/.forge-snapshots/PositionManager_collect_native.snap
+++ b/.forge-snapshots/PositionManager_collect_native.snap
@@ -1 +1 @@
-140870
\ No newline at end of file
+140599
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_collect_sameRange.snap b/.forge-snapshots/PositionManager_collect_sameRange.snap
index 5f10760f..35c98376 100644
--- a/.forge-snapshots/PositionManager_collect_sameRange.snap
+++ b/.forge-snapshots/PositionManager_collect_sameRange.snap
@@ -1 +1 @@
-149718
\ No newline at end of file
+149447
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_decreaseLiquidity.snap b/.forge-snapshots/PositionManager_decreaseLiquidity.snap
index ad2cf446..c6c2c4fa 100644
--- a/.forge-snapshots/PositionManager_decreaseLiquidity.snap
+++ b/.forge-snapshots/PositionManager_decreaseLiquidity.snap
@@ -1 +1 @@
-115261
\ No newline at end of file
+115032
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_decreaseLiquidity_native.snap b/.forge-snapshots/PositionManager_decreaseLiquidity_native.snap
index 1671a2c9..a00089a9 100644
--- a/.forge-snapshots/PositionManager_decreaseLiquidity_native.snap
+++ b/.forge-snapshots/PositionManager_decreaseLiquidity_native.snap
@@ -1 +1 @@
-108171
\ No newline at end of file
+107954
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_decrease_burnEmpty.snap b/.forge-snapshots/PositionManager_decrease_burnEmpty.snap
index 0dd409e3..f9bd3ffd 100644
--- a/.forge-snapshots/PositionManager_decrease_burnEmpty.snap
+++ b/.forge-snapshots/PositionManager_decrease_burnEmpty.snap
@@ -1 +1 @@
-133487
\ No newline at end of file
+133172
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_decrease_burnEmpty_native.snap b/.forge-snapshots/PositionManager_decrease_burnEmpty_native.snap
index 432fc190..59f0e691 100644
--- a/.forge-snapshots/PositionManager_decrease_burnEmpty_native.snap
+++ b/.forge-snapshots/PositionManager_decrease_burnEmpty_native.snap
@@ -1 +1 @@
-126226
\ No newline at end of file
+125911
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_decrease_sameRange_allLiquidity.snap b/.forge-snapshots/PositionManager_decrease_sameRange_allLiquidity.snap
index 2546c8e2..231e4fce 100644
--- a/.forge-snapshots/PositionManager_decrease_sameRange_allLiquidity.snap
+++ b/.forge-snapshots/PositionManager_decrease_sameRange_allLiquidity.snap
@@ -1 +1 @@
-127977
\ No newline at end of file
+127706
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_increaseLiquidity_erc20.snap b/.forge-snapshots/PositionManager_increaseLiquidity_erc20.snap
index 9062ddd1..5c321a26 100644
--- a/.forge-snapshots/PositionManager_increaseLiquidity_erc20.snap
+++ b/.forge-snapshots/PositionManager_increaseLiquidity_erc20.snap
@@ -1 +1 @@
-151197
\ No newline at end of file
+150926
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_increaseLiquidity_native.snap b/.forge-snapshots/PositionManager_increaseLiquidity_native.snap
index 770caaf9..f28c353a 100644
--- a/.forge-snapshots/PositionManager_increaseLiquidity_native.snap
+++ b/.forge-snapshots/PositionManager_increaseLiquidity_native.snap
@@ -1 +1 @@
-132997
\ No newline at end of file
+132726
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_increase_autocompoundExactUnclaimedFees.snap b/.forge-snapshots/PositionManager_increase_autocompoundExactUnclaimedFees.snap
index 25672fe1..0b3f25d5 100644
--- a/.forge-snapshots/PositionManager_increase_autocompoundExactUnclaimedFees.snap
+++ b/.forge-snapshots/PositionManager_increase_autocompoundExactUnclaimedFees.snap
@@ -1 +1 @@
-133924
\ No newline at end of file
+133653
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_increase_autocompoundExcessFeesCredit.snap b/.forge-snapshots/PositionManager_increase_autocompoundExcessFeesCredit.snap
index 5c8985e2..59b6bd97 100644
--- a/.forge-snapshots/PositionManager_increase_autocompoundExcessFeesCredit.snap
+++ b/.forge-snapshots/PositionManager_increase_autocompoundExcessFeesCredit.snap
@@ -1 +1 @@
-170080
\ No newline at end of file
+169809
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_mint.snap b/.forge-snapshots/PositionManager_mint.snap
index cb4f1c61..a11e91e9 100644
--- a/.forge-snapshots/PositionManager_mint.snap
+++ b/.forge-snapshots/PositionManager_mint.snap
@@ -1 +1 @@
-371232
\ No newline at end of file
+370961
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_mint_native.snap b/.forge-snapshots/PositionManager_mint_native.snap
index 0beb1d33..ee67f756 100644
--- a/.forge-snapshots/PositionManager_mint_native.snap
+++ b/.forge-snapshots/PositionManager_mint_native.snap
@@ -1 +1 @@
-335932
\ No newline at end of file
+335661
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_mint_nativeWithSweep.snap b/.forge-snapshots/PositionManager_mint_nativeWithSweep.snap
index 54bd5bcf..d296be79 100644
--- a/.forge-snapshots/PositionManager_mint_nativeWithSweep.snap
+++ b/.forge-snapshots/PositionManager_mint_nativeWithSweep.snap
@@ -1 +1 @@
-344562
\ No newline at end of file
+344170
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_mint_onSameTickLower.snap b/.forge-snapshots/PositionManager_mint_onSameTickLower.snap
index 9900e39e..42074607 100644
--- a/.forge-snapshots/PositionManager_mint_onSameTickLower.snap
+++ b/.forge-snapshots/PositionManager_mint_onSameTickLower.snap
@@ -1 +1 @@
-313914
\ No newline at end of file
+313643
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_mint_onSameTickUpper.snap b/.forge-snapshots/PositionManager_mint_onSameTickUpper.snap
index 4738722e..35f9fdd1 100644
--- a/.forge-snapshots/PositionManager_mint_onSameTickUpper.snap
+++ b/.forge-snapshots/PositionManager_mint_onSameTickUpper.snap
@@ -1 +1 @@
-314556
\ No newline at end of file
+314285
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_mint_sameRange.snap b/.forge-snapshots/PositionManager_mint_sameRange.snap
index 9742db4a..95a3e729 100644
--- a/.forge-snapshots/PositionManager_mint_sameRange.snap
+++ b/.forge-snapshots/PositionManager_mint_sameRange.snap
@@ -1 +1 @@
-240138
\ No newline at end of file
+239867
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_mint_settleWithBalance_sweep.snap b/.forge-snapshots/PositionManager_mint_settleWithBalance_sweep.snap
index dc2c7bb5..5c066bfe 100644
--- a/.forge-snapshots/PositionManager_mint_settleWithBalance_sweep.snap
+++ b/.forge-snapshots/PositionManager_mint_settleWithBalance_sweep.snap
@@ -1 +1 @@
-369400
\ No newline at end of file
+368863
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_mint_warmedPool_differentRange.snap b/.forge-snapshots/PositionManager_mint_warmedPool_differentRange.snap
index cbe27444..af506196 100644
--- a/.forge-snapshots/PositionManager_mint_warmedPool_differentRange.snap
+++ b/.forge-snapshots/PositionManager_mint_warmedPool_differentRange.snap
@@ -1 +1 @@
-319932
\ No newline at end of file
+319661
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_multicall_initialize_mint.snap b/.forge-snapshots/PositionManager_multicall_initialize_mint.snap
index dce5eb0f..b8cc5c06 100644
--- a/.forge-snapshots/PositionManager_multicall_initialize_mint.snap
+++ b/.forge-snapshots/PositionManager_multicall_initialize_mint.snap
@@ -1 +1 @@
-415608
\ No newline at end of file
+415324
\ No newline at end of file
diff --git a/.forge-snapshots/V4Router_Bytecode.snap b/.forge-snapshots/V4Router_Bytecode.snap
index 79a18dfd..1cc2794e 100644
--- a/.forge-snapshots/V4Router_Bytecode.snap
+++ b/.forge-snapshots/V4Router_Bytecode.snap
@@ -1 +1 @@
-6845
\ No newline at end of file
+6848
\ No newline at end of file
diff --git a/.forge-snapshots/V4Router_ExactIn1Hop_nativeIn.snap b/.forge-snapshots/V4Router_ExactIn1Hop_nativeIn.snap
index 24c9822b..25461ee4 100644
--- a/.forge-snapshots/V4Router_ExactIn1Hop_nativeIn.snap
+++ b/.forge-snapshots/V4Router_ExactIn1Hop_nativeIn.snap
@@ -1 +1 @@
-121090
\ No newline at end of file
+120831
\ No newline at end of file
diff --git a/.forge-snapshots/V4Router_ExactIn1Hop_nativeOut.snap b/.forge-snapshots/V4Router_ExactIn1Hop_nativeOut.snap
index 24ccfd9d..65ecd951 100644
--- a/.forge-snapshots/V4Router_ExactIn1Hop_nativeOut.snap
+++ b/.forge-snapshots/V4Router_ExactIn1Hop_nativeOut.snap
@@ -1 +1 @@
-120257
\ No newline at end of file
+119998
\ No newline at end of file
diff --git a/.forge-snapshots/V4Router_ExactIn1Hop_oneForZero.snap b/.forge-snapshots/V4Router_ExactIn1Hop_oneForZero.snap
index f891c6dd..58613908 100644
--- a/.forge-snapshots/V4Router_ExactIn1Hop_oneForZero.snap
+++ b/.forge-snapshots/V4Router_ExactIn1Hop_oneForZero.snap
@@ -1 +1 @@
-129129
\ No newline at end of file
+128870
\ No newline at end of file
diff --git a/.forge-snapshots/V4Router_ExactIn1Hop_zeroForOne.snap b/.forge-snapshots/V4Router_ExactIn1Hop_zeroForOne.snap
index f6834076..a5deae14 100644
--- a/.forge-snapshots/V4Router_ExactIn1Hop_zeroForOne.snap
+++ b/.forge-snapshots/V4Router_ExactIn1Hop_zeroForOne.snap
@@ -1 +1 @@
-135959
\ No newline at end of file
+135700
\ No newline at end of file
diff --git a/.forge-snapshots/V4Router_ExactIn2Hops.snap b/.forge-snapshots/V4Router_ExactIn2Hops.snap
index e70fa136..766e3ec2 100644
--- a/.forge-snapshots/V4Router_ExactIn2Hops.snap
+++ b/.forge-snapshots/V4Router_ExactIn2Hops.snap
@@ -1 +1 @@
-187311
\ No newline at end of file
+187052
\ No newline at end of file
diff --git a/.forge-snapshots/V4Router_ExactIn2Hops_nativeIn.snap b/.forge-snapshots/V4Router_ExactIn2Hops_nativeIn.snap
index 69edacf1..e87d8fdd 100644
--- a/.forge-snapshots/V4Router_ExactIn2Hops_nativeIn.snap
+++ b/.forge-snapshots/V4Router_ExactIn2Hops_nativeIn.snap
@@ -1 +1 @@
-179274
\ No newline at end of file
+179015
\ No newline at end of file
diff --git a/.forge-snapshots/V4Router_ExactIn3Hops.snap b/.forge-snapshots/V4Router_ExactIn3Hops.snap
index 6de237e2..57ca3ed9 100644
--- a/.forge-snapshots/V4Router_ExactIn3Hops.snap
+++ b/.forge-snapshots/V4Router_ExactIn3Hops.snap
@@ -1 +1 @@
-238692
\ No newline at end of file
+238431
\ No newline at end of file
diff --git a/.forge-snapshots/V4Router_ExactIn3Hops_nativeIn.snap b/.forge-snapshots/V4Router_ExactIn3Hops_nativeIn.snap
index 33ade7d1..ac26ce39 100644
--- a/.forge-snapshots/V4Router_ExactIn3Hops_nativeIn.snap
+++ b/.forge-snapshots/V4Router_ExactIn3Hops_nativeIn.snap
@@ -1 +1 @@
-230679
\ No newline at end of file
+230418
\ No newline at end of file
diff --git a/.forge-snapshots/V4Router_ExactInputSingle.snap b/.forge-snapshots/V4Router_ExactInputSingle.snap
index 2e8df555..baafd0ea 100644
--- a/.forge-snapshots/V4Router_ExactInputSingle.snap
+++ b/.forge-snapshots/V4Router_ExactInputSingle.snap
@@ -1 +1 @@
-134844
\ No newline at end of file
+134585
\ No newline at end of file
diff --git a/.forge-snapshots/V4Router_ExactInputSingle_nativeIn.snap b/.forge-snapshots/V4Router_ExactInputSingle_nativeIn.snap
index 3b00e8e8..b20f1123 100644
--- a/.forge-snapshots/V4Router_ExactInputSingle_nativeIn.snap
+++ b/.forge-snapshots/V4Router_ExactInputSingle_nativeIn.snap
@@ -1 +1 @@
-119975
\ No newline at end of file
+119716
\ No newline at end of file
diff --git a/.forge-snapshots/V4Router_ExactInputSingle_nativeOut.snap b/.forge-snapshots/V4Router_ExactInputSingle_nativeOut.snap
index 0bb776a3..551ad6eb 100644
--- a/.forge-snapshots/V4Router_ExactInputSingle_nativeOut.snap
+++ b/.forge-snapshots/V4Router_ExactInputSingle_nativeOut.snap
@@ -1 +1 @@
-119120
\ No newline at end of file
+118861
\ No newline at end of file
diff --git a/.forge-snapshots/V4Router_ExactOut1Hop_nativeIn_sweepETH.snap b/.forge-snapshots/V4Router_ExactOut1Hop_nativeIn_sweepETH.snap
index 77e59bce..ff75056d 100644
--- a/.forge-snapshots/V4Router_ExactOut1Hop_nativeIn_sweepETH.snap
+++ b/.forge-snapshots/V4Router_ExactOut1Hop_nativeIn_sweepETH.snap
@@ -1 +1 @@
-126893
\ No newline at end of file
+126634
\ No newline at end of file
diff --git a/.forge-snapshots/V4Router_ExactOut1Hop_nativeOut.snap b/.forge-snapshots/V4Router_ExactOut1Hop_nativeOut.snap
index f276517c..2a78ad41 100644
--- a/.forge-snapshots/V4Router_ExactOut1Hop_nativeOut.snap
+++ b/.forge-snapshots/V4Router_ExactOut1Hop_nativeOut.snap
@@ -1 +1 @@
-121098
\ No newline at end of file
+120839
\ No newline at end of file
diff --git a/.forge-snapshots/V4Router_ExactOut1Hop_oneForZero.snap b/.forge-snapshots/V4Router_ExactOut1Hop_oneForZero.snap
index efacec37..c096aff5 100644
--- a/.forge-snapshots/V4Router_ExactOut1Hop_oneForZero.snap
+++ b/.forge-snapshots/V4Router_ExactOut1Hop_oneForZero.snap
@@ -1 +1 @@
-129970
\ No newline at end of file
+129711
\ No newline at end of file
diff --git a/.forge-snapshots/V4Router_ExactOut1Hop_zeroForOne.snap b/.forge-snapshots/V4Router_ExactOut1Hop_zeroForOne.snap
index bd7e8a65..d7e597a2 100644
--- a/.forge-snapshots/V4Router_ExactOut1Hop_zeroForOne.snap
+++ b/.forge-snapshots/V4Router_ExactOut1Hop_zeroForOne.snap
@@ -1 +1 @@
-134771
\ No newline at end of file
+134512
\ No newline at end of file
diff --git a/.forge-snapshots/V4Router_ExactOut2Hops.snap b/.forge-snapshots/V4Router_ExactOut2Hops.snap
index be849ee5..0b16ab02 100644
--- a/.forge-snapshots/V4Router_ExactOut2Hops.snap
+++ b/.forge-snapshots/V4Router_ExactOut2Hops.snap
@@ -1 +1 @@
-186732
\ No newline at end of file
+186473
\ No newline at end of file
diff --git a/.forge-snapshots/V4Router_ExactOut2Hops_nativeIn.snap b/.forge-snapshots/V4Router_ExactOut2Hops_nativeIn.snap
index 1ae42da1..8f36869b 100644
--- a/.forge-snapshots/V4Router_ExactOut2Hops_nativeIn.snap
+++ b/.forge-snapshots/V4Router_ExactOut2Hops_nativeIn.snap
@@ -1 +1 @@
-183655
\ No newline at end of file
+183396
\ No newline at end of file
diff --git a/.forge-snapshots/V4Router_ExactOut3Hops.snap b/.forge-snapshots/V4Router_ExactOut3Hops.snap
index 9883a932..c85c7ce9 100644
--- a/.forge-snapshots/V4Router_ExactOut3Hops.snap
+++ b/.forge-snapshots/V4Router_ExactOut3Hops.snap
@@ -1 +1 @@
-238737
\ No newline at end of file
+238476
\ No newline at end of file
diff --git a/.forge-snapshots/V4Router_ExactOut3Hops_nativeIn.snap b/.forge-snapshots/V4Router_ExactOut3Hops_nativeIn.snap
index f55c5a60..1a3de82b 100644
--- a/.forge-snapshots/V4Router_ExactOut3Hops_nativeIn.snap
+++ b/.forge-snapshots/V4Router_ExactOut3Hops_nativeIn.snap
@@ -1 +1 @@
-235684
\ No newline at end of file
+235423
\ No newline at end of file
diff --git a/.forge-snapshots/V4Router_ExactOut3Hops_nativeOut.snap b/.forge-snapshots/V4Router_ExactOut3Hops_nativeOut.snap
index 4301df86..3bcd6d88 100644
--- a/.forge-snapshots/V4Router_ExactOut3Hops_nativeOut.snap
+++ b/.forge-snapshots/V4Router_ExactOut3Hops_nativeOut.snap
@@ -1 +1 @@
-229889
\ No newline at end of file
+229628
\ No newline at end of file
diff --git a/.forge-snapshots/V4Router_ExactOutputSingle.snap b/.forge-snapshots/V4Router_ExactOutputSingle.snap
index e04bda5d..cdb4e3f8 100644
--- a/.forge-snapshots/V4Router_ExactOutputSingle.snap
+++ b/.forge-snapshots/V4Router_ExactOutputSingle.snap
@@ -1 +1 @@
-133648
\ No newline at end of file
+133389
\ No newline at end of file
diff --git a/.forge-snapshots/V4Router_ExactOutputSingle_nativeIn_sweepETH.snap b/.forge-snapshots/V4Router_ExactOutputSingle_nativeIn_sweepETH.snap
index 15a7c019..5bd89013 100644
--- a/.forge-snapshots/V4Router_ExactOutputSingle_nativeIn_sweepETH.snap
+++ b/.forge-snapshots/V4Router_ExactOutputSingle_nativeIn_sweepETH.snap
@@ -1 +1 @@
-125770
\ No newline at end of file
+125511
\ No newline at end of file
diff --git a/.forge-snapshots/V4Router_ExactOutputSingle_nativeOut.snap b/.forge-snapshots/V4Router_ExactOutputSingle_nativeOut.snap
index 6fb6e08d..217aedf8 100644
--- a/.forge-snapshots/V4Router_ExactOutputSingle_nativeOut.snap
+++ b/.forge-snapshots/V4Router_ExactOutputSingle_nativeOut.snap
@@ -1 +1 @@
-120033
\ No newline at end of file
+119774
\ No newline at end of file
diff --git a/src/base/BaseActionsRouter.sol b/src/base/BaseActionsRouter.sol
index 66384efc..bdc58083 100644
--- a/src/base/BaseActionsRouter.sol
+++ b/src/base/BaseActionsRouter.sol
@@ -25,15 +25,17 @@ abstract contract BaseActionsRouter is SafeCallback {
     }
 
     /// @notice function that is called by the PoolManager through the SafeCallback.unlockCallback
+    /// @param data Abi encoding of (bytes actions, bytes[] params)
+    /// where params[i] is the encoded parameters for actions[i]
     function _unlockCallback(bytes calldata data) internal override returns (bytes memory) {
-        // abi.decode(data, (uint256[], bytes[]));
-        (uint256[] calldata actions, bytes[] calldata params) = data.decodeActionsRouterParams();
+        // abi.decode(data, (bytes, bytes[]));
+        (bytes calldata actions, bytes[] calldata params) = data.decodeActionsRouterParams();
 
         uint256 numActions = actions.length;
         if (numActions != params.length) revert InputLengthMismatch();
 
         for (uint256 actionIndex = 0; actionIndex < numActions; actionIndex++) {
-            uint256 action = actions[actionIndex];
+            uint256 action = uint256(uint8(actions[actionIndex]));
 
             _handleAction(action, params[actionIndex]);
         }
diff --git a/src/libraries/CalldataDecoder.sol b/src/libraries/CalldataDecoder.sol
index a9dca15b..11d24551 100644
--- a/src/libraries/CalldataDecoder.sol
+++ b/src/libraries/CalldataDecoder.sol
@@ -17,7 +17,7 @@ library CalldataDecoder {
     function decodeActionsRouterParams(bytes calldata _bytes)
         internal
         pure
-        returns (uint256[] calldata actions, bytes[] calldata params)
+        returns (bytes calldata actions, bytes[] calldata params)
     {
         assembly ("memory-safe") {
             // The offset of the 0th element is 0, which stores the offset of the length pointer of actions array.
diff --git a/test/shared/Planner.sol b/test/shared/Planner.sol
index 4bd0c1c9..71020abe 100644
--- a/test/shared/Planner.sol
+++ b/test/shared/Planner.sol
@@ -8,7 +8,7 @@ import {Actions} from "../../src/libraries/Actions.sol";
 import {Currency} from "@uniswap/v4-core/src/types/Currency.sol";
 
 struct Plan {
-    uint256[] actions;
+    bytes actions;
     bytes[] params;
 }
 
@@ -16,21 +16,20 @@ library Planner {
     using Planner for Plan;
 
     function init() internal pure returns (Plan memory plan) {
-        return Plan({actions: new uint256[](0), params: new bytes[](0)});
+        return Plan({actions: bytes(""), params: new bytes[](0)});
     }
 
     function add(Plan memory plan, uint256 action, bytes memory param) internal pure returns (Plan memory) {
-        uint256[] memory actions = new uint256[](plan.actions.length + 1);
+        bytes memory actions = new bytes(plan.params.length + 1);
         bytes[] memory params = new bytes[](plan.params.length + 1);
 
-        for (uint256 i; i < actions.length - 1; i++) {
+        for (uint256 i; i < params.length - 1; i++) {
             // Copy from plan.
-            actions[i] = plan.actions[i];
             params[i] = plan.params[i];
+            actions[i] = plan.actions[i];
         }
-
-        actions[actions.length - 1] = action;
         params[params.length - 1] = param;
+        actions[params.length - 1] = bytes1(uint8(action));
 
         plan.actions = actions;
         plan.params = params;