diff --git a/index.js b/index.js
index 6b9cd17..82c51e8 100644
--- a/index.js
+++ b/index.js
@@ -133,7 +133,7 @@ exports.register = (server, options) => {
             requestedVersion = options.defaultVersion;
         }
 
-        const versionedPath = options.basePath + 'v' + requestedVersion + request.path.slice(options.basePath.length - 1);
+        const versionedPath = options.basePath + 'v' + requestedVersion + request.path;
 
         let method = request.method;
         if (request.method === 'options') {
@@ -147,7 +147,7 @@ exports.register = (server, options) => {
         const route = server.match(method, versionedPath);
 
         if (route && route.path.indexOf(options.basePath + 'v' + requestedVersion + '/') === 0) {
-            request.setUrl(options.basePath + 'v' + requestedVersion + request.path.slice(options.basePath.length - 1) + (request.url.search || '')); //required to preserve query parameters
+            request.setUrl(options.basePath + 'v' + requestedVersion + request.path + (request.url.search || '')); //required to preserve query parameters
         }
 
         //Set version for usage in handler