diff --git a/src/middleware.ts b/src/middleware.ts
index 40a3df1..14b0deb 100644
--- a/src/middleware.ts
+++ b/src/middleware.ts
@@ -173,7 +173,7 @@ function get_route_handler(chunks: Record<string, string>, routes: RouteObject[]
 						error = { statusCode, message };
 					},
 					fetch: (url: string, opts?: any) => {
-						const parsed = new URL(url, `http://127.0.0.1:${process.env.PORT}${req.baseUrl}${req.path}`);
+						const parsed = new URL(url, `http://127.0.0.1:${process.env.PORT}${req.baseUrl ? req.baseUrl + '/'  :''}`);
 
 						if (opts) {
 							opts = Object.assign({}, opts);
diff --git a/test/app/routes/credentials/index.html b/test/app/routes/credentials/index.html
index fa29efa..76e4a63 100644
--- a/test/app/routes/credentials/index.html
+++ b/test/app/routes/credentials/index.html
@@ -3,7 +3,6 @@
 <script>
 	export default {
 		preload({ query }) {
-			console.log(`here ${this.fetch}`);
 			return this.fetch(`credentials/test.json`, {
 				credentials: query.creds
 			}).then(r => r.json());