diff --git a/src/Adliance.AzureBlobSimulator/Controllers/ContainersController.cs b/src/Adliance.AzureBlobSimulator/Controllers/ContainersController.cs
index 01e49f6..915ead8 100644
--- a/src/Adliance.AzureBlobSimulator/Controllers/ContainersController.cs
+++ b/src/Adliance.AzureBlobSimulator/Controllers/ContainersController.cs
@@ -30,7 +30,7 @@ private IActionResult ListContainers()
 
         foreach (var d in containerService.GetContainers())
         {
-            containers.Add(new Container(d.Value));
+            containers.Add(new Container(d.Key));
         }
 
         var response = new ContainerEnumerationResults
diff --git a/src/Adliance.AzureBlobSimulator/Services/ContainerService.cs b/src/Adliance.AzureBlobSimulator/Services/ContainerService.cs
index 0e489d3..a609d76 100644
--- a/src/Adliance.AzureBlobSimulator/Services/ContainerService.cs
+++ b/src/Adliance.AzureBlobSimulator/Services/ContainerService.cs
@@ -44,7 +44,7 @@ public Dictionary<string, string> GetContainers()
         {
             foreach (var d in Directory.GetDirectories(options.Value.LocalPath))
             {
-                result.Add(Path.GetFileName(d), d);
+                result[Path.GetFileName(d)] = d;
             }
         }