diff --git a/examples/base-path/.gitignore b/examples/base-path/.gitignore
index 552a9728..a7cfab1c 100644
--- a/examples/base-path/.gitignore
+++ b/examples/base-path/.gitignore
@@ -1,7 +1,6 @@
 node_modules/
 elm-stuff/
 dist/
-!dist/**/*.html
 .cache/
 .elm-pages/
 functions/render/elm-pages-cli.js
diff --git a/examples/base-path/dist/base-path/index.html b/examples/base-path/dist/base-path/index.html
new file mode 100644
index 00000000..7ca12b82
--- /dev/null
+++ b/examples/base-path/dist/base-path/index.html
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+  <html lang="en">
+  <head>
+    <link rel="stylesheet" href="\base-path\style.css">
+    
+    <link rel="preload" href="\base-path\elm.js" as="script">
+    <link rel="modulepreload" href="\base-path\index.js">
+    
+    <script defer="defer" src="\base-path\elm.js" type="text/javascript"></script>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width,initial-scale=1">
+    <script type="module">
+import userInit from"\base-path\index.js";
+let prefetchedPages=[window.location.pathname],initialLocationHash=document.location.hash.replace(/^#/,"");function loadContentAndInitializeApp(){let a=window.location.pathname.replace(/(w)$/,"$1/");a.endsWith("/")||(a+="/");const b=Elm.TemplateModulesBeta.init({flags:{secrets:null,baseUrl:document.baseURI,isPrerendering:!1,isDevServer:!1,isElmDebugMode:!1,contentJson:JSON.parse(document.getElementById("__ELM_PAGES_DATA__").innerHTML),userFlags:userInit.flags()}});return b.ports.toJsPort.subscribe(()=>{loadNamedAnchor()}),b}function loadNamedAnchor(){if(""!==initialLocationHash){const a=document.querySelector(`[name=${initialLocationHash}]`);a&&a.scrollIntoView()}}function prefetchIfNeeded(a){if(a.host===window.location.host&&!prefetchedPages.includes(a.pathname)){prefetchedPages.push(a.pathname),console.log("Preloading...",a.pathname);const b=document.createElement("link");b.setAttribute("as","fetch"),b.setAttribute("rel","prefetch"),b.setAttribute("href",origin+a.pathname+"/content.json"),document.head.appendChild(b)}}const appPromise=new Promise(function(a){document.addEventListener("DOMContentLoaded",()=>{a(loadContentAndInitializeApp())})});userInit.load(appPromise),"function"==typeof connect&&connect(function(a){appPromise.then(b=>{b.ports.fromJsPort.send({contentJson:a})})});const trigger_prefetch=b=>{const c=find_anchor(b.target);c&&c.href&&c.hasAttribute("elm-pages:prefetch")&&prefetchIfNeeded(c)};let mousemove_timeout;const handle_mousemove=a=>{clearTimeout(mousemove_timeout),mousemove_timeout=setTimeout(()=>{trigger_prefetch(a)},20)};addEventListener("touchstart",trigger_prefetch),addEventListener("mousemove",handle_mousemove);function find_anchor(a){for(;a&&"A"!==a.nodeName.toUpperCase();)a=a.parentNode;return a}
+    </script>
+    <title>Page not found</title>
+    <meta name="generator" content="elm-pages v2.1.9">
+    <link rel="manifest" href="\base-path\manifest.json">
+    <meta name="mobile-web-app-capable" content="yes">
+    <meta name="theme-color" content="#ffffff">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
+    
+    <script id="__ELM_PAGES_DATA__" type="application/json">{"staticData":{"notFoundReason":"{\"reason\":{\"tag\":\"NoMatchingRoute\",\"args\":[]},\"path\":[\"base-path\"]}","path":"/base-path"},"is404":true,"path":"/base-path"}</script>
+    </head>
+    <body>
+      <div data-url="" display="none"></div>
+      <div style="padding:30px;" id="not-found-reason">No route found for <code>/base-path</code> Did you mean to go to one of these routes:<ul style="padding-top:30px;"><li style="list-style:inside;"><span><code>/sub-page</code></span></li><li style="list-style:inside;"><span><code>/</code></span></li></ul></div>
+    </body>
+  </html>
+  
\ No newline at end of file
diff --git a/examples/base-path/dist/sub-page/index.html b/examples/base-path/dist/sub-page/index.html
new file mode 100644
index 00000000..ccb98424
--- /dev/null
+++ b/examples/base-path/dist/sub-page/index.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+  <html lang="en">
+  <head>
+    <link rel="stylesheet" href="\base-path\style.css">
+    
+    <link rel="preload" href="\base-path\elm.js" as="script">
+    <link rel="modulepreload" href="\base-path\index.js">
+    
+    <script defer="defer" src="\base-path\elm.js" type="text/javascript"></script>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width,initial-scale=1">
+    <script type="module">
+import userInit from"\base-path\index.js";
+let prefetchedPages=[window.location.pathname],initialLocationHash=document.location.hash.replace(/^#/,"");function loadContentAndInitializeApp(){let a=window.location.pathname.replace(/(w)$/,"$1/");a.endsWith("/")||(a+="/");const b=Elm.TemplateModulesBeta.init({flags:{secrets:null,baseUrl:document.baseURI,isPrerendering:!1,isDevServer:!1,isElmDebugMode:!1,contentJson:JSON.parse(document.getElementById("__ELM_PAGES_DATA__").innerHTML),userFlags:userInit.flags()}});return b.ports.toJsPort.subscribe(()=>{loadNamedAnchor()}),b}function loadNamedAnchor(){if(""!==initialLocationHash){const a=document.querySelector(`[name=${initialLocationHash}]`);a&&a.scrollIntoView()}}function prefetchIfNeeded(a){if(a.host===window.location.host&&!prefetchedPages.includes(a.pathname)){prefetchedPages.push(a.pathname),console.log("Preloading...",a.pathname);const b=document.createElement("link");b.setAttribute("as","fetch"),b.setAttribute("rel","prefetch"),b.setAttribute("href",origin+a.pathname+"/content.json"),document.head.appendChild(b)}}const appPromise=new Promise(function(a){document.addEventListener("DOMContentLoaded",()=>{a(loadContentAndInitializeApp())})});userInit.load(appPromise),"function"==typeof connect&&connect(function(a){appPromise.then(b=>{b.ports.fromJsPort.send({contentJson:a})})});const trigger_prefetch=b=>{const c=find_anchor(b.target);c&&c.href&&c.hasAttribute("elm-pages:prefetch")&&prefetchIfNeeded(c)};let mousemove_timeout;const handle_mousemove=a=>{clearTimeout(mousemove_timeout),mousemove_timeout=setTimeout(()=>{trigger_prefetch(a)},20)};addEventListener("touchstart",trigger_prefetch),addEventListener("mousemove",handle_mousemove);function find_anchor(a){for(;a&&"A"!==a.nodeName.toUpperCase();)a=a.parentNode;return a}
+    </script>
+    <title></title>
+    <meta name="generator" content="elm-pages v2.1.9">
+    <link rel="manifest" href="\base-path\manifest.json">
+    <meta name="mobile-web-app-capable" content="yes">
+    <meta name="theme-color" content="#ffffff">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
+        <link rel="canonical" href="https://elm-pages.com/sub-page" />    <meta name="description" content="TODO" />    <meta property="og:image" content="TODO" />    <meta property="og:image:secure_url" content="TODO" />    <meta property="og:image:alt" content="elm-pages logo" />    <meta property="og:title" content="TODO title" />    <meta property="og:url" content="https://elm-pages.com/sub-page" />    <meta property="og:description" content="TODO" />    <meta property="og:site_name" content="elm-pages" />    <meta property="twitter:card" content="summary" />    <meta property="twitter:title" content="TODO title" />    <meta property="twitter:description" content="TODO" />    <meta property="twitter:image" content="TODO" />    <meta property="twitter:image:alt" content="elm-pages logo" />    <meta property="og:type" content="website" />    <link rel="icon" sizes="32x32" type="image/png" href="https://res.cloudinary.com/dillonkearns/image/upload/c_pad,w_32,h_32,q_auto,f_png/v1603234028/elm-pages/elm-pages-icon" />    <link rel="icon" sizes="16x16" type="image/png" href="https://res.cloudinary.com/dillonkearns/image/upload/c_pad,w_16,h_16,q_auto,f_png/v1603234028/elm-pages/elm-pages-icon" />    <link rel="apple-touch-icon" sizes="180x180" href="https://res.cloudinary.com/dillonkearns/image/upload/c_pad,w_180,h_180,q_auto,f_png/v1603234028/elm-pages/elm-pages-icon" />    <link rel="apple-touch-icon" sizes="192x192" href="https://res.cloudinary.com/dillonkearns/image/upload/c_pad,w_192,h_192,q_auto,f_png/v1603234028/elm-pages/elm-pages-icon" />    <link rel="sitemap" type="application/xml" href="/sitemap.xml" />
+    <script id="__ELM_PAGES_DATA__" type="application/json">{"staticData":{},"is404":false,"path":"sub-page"}</script>
+    </head>
+    <body>
+      <div data-url="" display="none"></div>
+      <div><style>._f57fa588 {
+    max-width:10rem;
+}</style><label for="note"></label><div><style>div > p {
+    font-size:14px;
+    color:rgb(255, 0, 0);
+}</style><div><p>Here is the Elm logo:</p><img class="_f57fa588" src="/images/elm-logo.svg"></div></div></div>
+    </body>
+  </html>
+  
\ No newline at end of file
