1 files changed, 4 insertions, 2 deletions
diff --git a/src/main/scala/firrtl/Namespace.scala b/src/main/scala/firrtl/Namespace.scala
index a4b7bc7a..81fdaaa1 100644
--- a/src/main/scala/firrtl/Namespace.scala
+++ b/src/main/scala/firrtl/Namespace.scala
@@ -27,10 +27,12 @@ class Namespace private {
     else {
       var idx = indices.getOrElse(value, 0)
       var str = value
-      do {
+      while {
+        !(tryName(str))
+      } do {
         str = s"${value}_$idx"
         idx += 1
-      } while (!(tryName(str)))
+      }
       indices(value) = idx
       str
     }