diff --git a/simpleclient/src/main/java/io/prometheus/client/CollectorRegistry.java b/simpleclient/src/main/java/io/prometheus/client/CollectorRegistry.java
index 25baba669..a044d4e65 100644
--- a/simpleclient/src/main/java/io/prometheus/client/CollectorRegistry.java
+++ b/simpleclient/src/main/java/io/prometheus/client/CollectorRegistry.java
@@ -109,10 +109,13 @@ private List<String> collectorNames(Collector m) {
           names.add(family.name + "_count");
           names.add(family.name + "_sum");
           names.add(family.name);
+          break;
         case HISTOGRAM:
           names.add(family.name + "_count");
           names.add(family.name + "_sum");
           names.add(family.name + "_bucket");
+          names.add(family.name);
+          break;
         default:
           names.add(family.name);
       }