diff --git a/blobstore/src/main/java/org/jclouds/blobstore/config/LocalBlobStore.java b/blobstore/src/main/java/org/jclouds/blobstore/config/LocalBlobStore.java
index 9b1ef849bd1..d44f93d748f 100644
--- a/blobstore/src/main/java/org/jclouds/blobstore/config/LocalBlobStore.java
+++ b/blobstore/src/main/java/org/jclouds/blobstore/config/LocalBlobStore.java
@@ -367,7 +367,6 @@ private SortedSet<StorageMetadata> extractCommonPrefixes(SortedSet<StorageMetada
          if (!contents.contains(md)) {
             contents.add(md);
          }
-         contents.add(md);
       }
       return contents;
    }
diff --git a/blobstore/src/test/java/org/jclouds/blobstore/strategy/internal/ListContainerTest.java b/blobstore/src/test/java/org/jclouds/blobstore/strategy/internal/ListContainerTest.java
index cb9f79e0a19..78af809efe4 100644
--- a/blobstore/src/test/java/org/jclouds/blobstore/strategy/internal/ListContainerTest.java
+++ b/blobstore/src/test/java/org/jclouds/blobstore/strategy/internal/ListContainerTest.java
@@ -193,6 +193,22 @@ public void testListBlobEndsWithDelimiter() {
       assertThat(Iterables.get(results, 0).getType()).isNotEqualTo(StorageType.RELATIVE_PATH);
    }
 
+   public void testListBlobEndsWithDelimiterAndDelimiterFilter() {
+      String containerName = "testListBlobEndsWithDelimiterAndDelimiterFilter";
+      blobStore.createContainerInLocation(null, containerName);
+      blobStore.putBlob(containerName, blobStore.blobBuilder("foo/").type(StorageType.FOLDER)
+         .payload(ByteSource.empty()).build());
+      blobStore.putBlob(containerName, blobStore.blobBuilder("bar/text").type(StorageType.BLOB)
+         .payload(ByteSource.empty()).build());
+      PageSet<? extends StorageMetadata> results = blobStore.list(containerName,
+         ListContainerOptions.Builder.delimiter("/"));
+      assertThat(results.size()).isEqualTo(2);
+      assertThat(Iterables.get(results, 0).getName()).isEqualTo("bar/");
+      assertThat(Iterables.get(results, 0).getType()).isEqualTo(StorageType.RELATIVE_PATH);
+      assertThat(Iterables.get(results, 1).getName()).isEqualTo("foo/");
+      assertThat(Iterables.get(results, 1).getType()).isEqualTo(StorageType.FOLDER);
+   }
+
    public void testDirectoryListing() {
       String containerName = "testDirectoryListing";
       blobStore.createContainerInLocation(null, containerName);