Merge branch 'master' into big-decimal-methods-for-num-types

# Conflicts:
#	src/test/scala/chiselTests/IntervalSpec.scala

1 files changed, 1 insertions, 1 deletions

diff --git a/chiselFrontend/src/main/scala/chisel3/internal/Builder.scala b/chiselFrontend/src/main/scala/chisel3/internal/Builder.scala
index b5f617f0..c119315d 100644
--- a/chiselFrontend/src/main/scala/chisel3/internal/Builder.scala
+++ b/chiselFrontend/src/main/scala/chisel3/internal/Builder.scala
@@ -18,7 +18,7 @@ private[chisel3] class Namespace(keywords: Set[String]) {
     names(keyword) = 1
 
   private def rename(n: String): String = {
-    val index = names.getOrElse(n, 1L)
+    val index = names(n)
     val tryName = s"${n}_${index}"
     names(n) = index + 1
     if (this contains tryName) rename(n) else tryName