diff --git a/public/404.html b/public/404.html
index 513bfeb..07fc412 100644
--- a/public/404.html
+++ b/public/404.html
@@ -22,7 +22,7 @@
       // then set pathSegmentsToKeep to 1 so that routes like /repo-name/about will 
       // become /repo-name/?/about, and not /?/repo-name/about.
 
-      var pathSegmentsToKeep = 0;
+      var pathSegmentsToKeep = 1;
 
       var l = window.location;
       l.replace(
diff --git a/src/main.tsx b/src/main.tsx
index 1962a65..9fde137 100644
--- a/src/main.tsx
+++ b/src/main.tsx
@@ -8,7 +8,7 @@ import App from './App.tsx'
 
 createRoot(document.getElementById('root')!).render(
   <StrictMode>
-    <BrowserRouter>
+    <BrowserRouter basename="/fifthlang.github.io">
       <App />
     </BrowserRouter>
   </StrictMode>,
diff --git a/vite.config.ts b/vite.config.ts
index beb9a76..2365279 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -4,5 +4,5 @@ import react from '@vitejs/plugin-react'
 // https://vite.dev/config/
 export default defineConfig({
   plugins: [react()],
-  base: '/',
+  base: '/fifthlang.github.io/',
 })