diff --git a/hugolib/page_bundler_test.go b/hugolib/page_bundler_test.go
index bb4980c04..474f6676d 100644
--- a/hugolib/page_bundler_test.go
+++ b/hugolib/page_bundler_test.go
@@ -80,6 +80,9 @@ func TestPageBundlerSite(t *testing.T) {
 				singlePage := s.getPage(KindPage, "a/1.md")
 
 				assert.NotNil(singlePage)
+				assert.Equal(singlePage, s.getPage("page", "a/1"))
+				assert.Equal(singlePage, s.getPage("page", "1"))
+
 				assert.Contains(singlePage.Content, "TheContent")
 
 				if ugly {
diff --git a/hugolib/page_collections.go b/hugolib/page_collections.go
index c9104de3b..03b606955 100644
--- a/hugolib/page_collections.go
+++ b/hugolib/page_collections.go
@@ -86,6 +86,9 @@ func (c *PageCollections) refreshPageCaches() {
 								_, name := path.Split(dir)
 								cache[name] = p
 								cache[dir] = p
+							} else {
+								// Again, ambigous
+								cache[translasionBaseName] = p
 							}
 
 							// We need a way to get to the current language version.