diff --git a/src/gateway/Gateway.sol b/src/gateway/Gateway.sol
index ff3e16b5..28add2ad 100644
--- a/src/gateway/Gateway.sol
+++ b/src/gateway/Gateway.sol
@@ -197,9 +197,9 @@ contract Gateway is Auth, IGateway {
         // Hardcoded paths for root + pool & investment managers for gas efficiency
         if (id >= 5 && id <= 7) {
             manager = address(root);
-        } else if (id >= 9 && id <= 20) {
+        } else if (id >= 9 && id <= 18) {
             manager = poolManager;
-        } else if (id >= 21 && id <= 29) {
+        } else if (id >= 19 && id <= 27) {
             manager = investmentManager;
         } else {
             // Dynamic path for other managers, to be able to easily
diff --git a/src/libraries/MessagesLib.sol b/src/libraries/MessagesLib.sol
index 7b4702f7..7646b302 100644
--- a/src/libraries/MessagesLib.sol
+++ b/src/libraries/MessagesLib.sol
@@ -54,23 +54,23 @@ library MessagesLib {
         /// 18 - Update a user restriction
         UpdateRestriction,
         /// --- Investment Manager ---
-        /// 21 - Increase an investment order by a given amount
+        /// 19 - Increase an investment order by a given amount
         DepositRequest,
-        /// 22 - Increase a Redeem order by a given amount
+        /// 20 - Increase a Redeem order by a given amount
         RedeemRequest,
-        /// 23 - Executed Collect Invest
+        /// 21 - Executed Collect Invest
         FulfilledDepositRequest,
-        /// 24 - Executed Collect Redeem
+        /// 22 - Executed Collect Redeem
         FulfilledRedeemRequest,
-        /// 25 - Cancel an investment order
+        /// 23 - Cancel an investment order
         CancelDepositRequest,
-        /// 26 - Cancel a redeem order
+        /// 24 - Cancel a redeem order
         CancelRedeemRequest,
-        /// 27 - Executed Decrease Invest Order
+        /// 25 - Executed Decrease Invest Order
         FulfilledCancelDepositRequest,
-        /// 28 - Executed Decrease Redeem Order
+        /// 26 - Executed Decrease Redeem Order
         FulfilledCancelRedeemRequest,
-        /// 29 - Request redeem investor
+        /// 27 - Request redeem investor
         TriggerRedeemRequest
     }