diff --git a/src/GeekLearning.Storage.Azure/AzureStore.cs b/src/GeekLearning.Storage.Azure/AzureStore.cs
index f6bb948..0243c8a 100644
--- a/src/GeekLearning.Storage.Azure/AzureStore.cs
+++ b/src/GeekLearning.Storage.Azure/AzureStore.cs
@@ -113,13 +113,13 @@ public async ValueTask<IFileReference[]> ListAsync(string path, string searchPat
             }
             while (continuationToken != null);
 
-            var pathMap = results.OfType<ICloudBlob>().Select(blob => new Internal.AzureFileReference(blob, withMetadata: withMetadata)).ToDictionary(x => x.Path);
+            var pathMap = results.OfType<ICloudBlob>()
+                .Select(blob => new Internal.AzureFileReference(blob, withMetadata: withMetadata))
+                .ToDictionary(x => Path.GetFileName(x.Path));
 
-            var filteredResults = matcher.Execute(
-                new Internal.AzureListDirectoryWrapper(path,
-                pathMap));
+            var filteredResults = matcher.Execute(new Internal.AzureListDirectoryWrapper(path, pathMap));
 
-            return filteredResults.Files.Select(x => pathMap[path + x.Path]).ToArray();
+            return filteredResults.Files.Select(x => pathMap[x.Path]).ToArray();
         }
 
         public async ValueTask<IFileReference> GetAsync(IPrivateFileReference file, bool withMetadata)