diff --git a/src/PathProcessor/CommercePathProcessor.php b/src/PathProcessor/CommercePathProcessor.php
index 05a5399..4766c0d 100644
--- a/src/PathProcessor/CommercePathProcessor.php
+++ b/src/PathProcessor/CommercePathProcessor.php
@@ -18,9 +18,8 @@ class CommercePathProcessor implements InboundPathProcessorInterface, OutboundPa
    */
   public function processInbound($path, Request $request) {
     if ($request instanceof Request) {
-      //Get the current requested uri.
-      $current_path = $request->getRequestUri();
-      $arg = explode('/', $current_path);
+      //Explode the current path
+      $arg = explode('/', $path);
       if ($arg[1] == "checkout") {
         $path = $this->commerceUrlProcess($path, $arg, EncryptDecrypt::DECRYPT);
       }
@@ -33,9 +32,8 @@ class CommercePathProcessor implements InboundPathProcessorInterface, OutboundPa
    */
   public function processOutbound($path, &$options = [], Request $request = NULL, BubbleableMetadata $bubbleable_metadata = NULL) {
     if ($request instanceof Request) {
-      //Get the current requested uri.
-      $current_path = $request->getRequestUri();
-      $arg = explode('/', $current_path);
+      //Explode the current path
+      $arg = explode('/', $path);
       if ($arg[1] == "checkout") {
         $path = $this->commerceUrlProcess($path, $arg, EncryptDecrypt::ENCRYPT);
       }