diff --git a/.travis.yml b/.travis.yml
index b7f839d..4ae37b3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,7 @@ sudo: false
 language: node_js
 
 node_js:
-  - "stable"
+  - "11"
 
 env:
   global:
diff --git a/runtime/src/app/app.ts b/runtime/src/app/app.ts
index f819ba1..88413b3 100644
--- a/runtime/src/app/app.ts
+++ b/runtime/src/app/app.ts
@@ -289,7 +289,7 @@ export async function hydrate_target(target: Target): Promise<{
 			const j = l++;
 
 			const segment = segments[i];
-			if (!session_dirty && current_branch[i] && current_branch[i].segment === segment) return current_branch[i];
+			if (!session_dirty && current_branch[i] && current_branch[i].segment === segment && current_branch[i].part === part.i) return current_branch[i];
 
 			const { default: component, preload } = await load_component(components[part.i]);
 
@@ -306,7 +306,7 @@ export async function hydrate_target(target: Target): Promise<{
 				preloaded = initial_data.preloaded[i + 1];
 			}
 
-			return (props[`level${j}`] = { component, props: preloaded, segment });
+			return (props[`level${j}`] = { component, props: preloaded, segment, part: part.i });
 		}));
 	} catch (error) {
 		props.error = error;
diff --git a/runtime/src/server/middleware/get_page_handler.ts b/runtime/src/server/middleware/get_page_handler.ts
index 6a4ea14..fb841d8 100644
--- a/runtime/src/server/middleware/get_page_handler.ts
+++ b/runtime/src/server/middleware/get_page_handler.ts
@@ -145,7 +145,7 @@ export function get_page_handler(
 					path: req.path,
 					query: req.query,
 					params: {}
-				})
+				}, session)
 				: {};
 
 			match = error ? null : page.pattern.exec(req.path);
diff --git a/src/api/export.ts b/src/api/export.ts
index ba6a9db..1d1be4c 100644
--- a/src/api/export.ts
+++ b/src/api/export.ts
@@ -212,6 +212,6 @@ async function _export({
 }
 
 function get_href(attrs: string) {
-	const match = /href\s*=\s*(?:"(.*?)"|'(.+?)'|([^\s>]+))/.exec(attrs);
-	return match[1] || match[2] || match[3];
+	const match = /href\s*=\s*(?:"(.*?)"|'(.*?)'|([^\s>]*))/.exec(attrs);
+	return match && (match[1] || match[2] || match[3]);
 }
diff --git a/test/apps/basics/src/routes/dirs/bar/[a].svelte b/test/apps/basics/src/routes/dirs/bar/[a].svelte
new file mode 100644
index 0000000..b31915f
--- /dev/null
+++ b/test/apps/basics/src/routes/dirs/bar/[a].svelte
@@ -0,0 +1,3 @@
+<h1>A page</h1>
+
+<a href="dirs/foo/xyz">same segment</a>
diff --git a/test/apps/basics/src/routes/dirs/foo/[b].svelte b/test/apps/basics/src/routes/dirs/foo/[b].svelte
new file mode 100644
index 0000000..f7a165f
--- /dev/null
+++ b/test/apps/basics/src/routes/dirs/foo/[b].svelte
@@ -0,0 +1 @@
+<h1>B page</h1>
diff --git a/test/apps/basics/test.ts b/test/apps/basics/test.ts
index 9516e9f..45e02cd 100644
--- a/test/apps/basics/test.ts
+++ b/test/apps/basics/test.ts
@@ -298,6 +298,17 @@ describe('basics', function() {
 			await page.evaluate(() => document.body.textContent),
 			'xyz,abc,qwe'
 		);
+  });
+  
+	it('navigates between dynamic routes with same segments', async () => {
+		await page.goto(`${base}/dirs/bar/xyz`);
+		await start();
+
+		assert.equal(await title(), 'A page');
+
+		await page.click('[href="dirs/foo/xyz"]');
+		await wait(50);
+		assert.equal(await title(), 'B page');
 	});
   
 	it('runs server route handlers before page handlers, if they match', async () => {
diff --git a/test/apps/export/src/routes/index.svelte b/test/apps/export/src/routes/index.svelte
index cdeb5a8..1928902 100644
--- a/test/apps/export/src/routes/index.svelte
+++ b/test/apps/export/src/routes/index.svelte
@@ -1,4 +1,9 @@
 <h1>Great success!</h1>
 
 <a href="blog">blog</a>
-<a href="">empty anchor</a>
\ No newline at end of file
+<a href="">empty anchor</a>
+<a href=''>empty anchor #2</a>
+<a href=>empty anchor #3</a>
+<a href= >empty anchor #4</a>
+<a href>empty anchor #5</a>
+<a>empty anchor #6</a>