diff --git a/rocket/src/main/scala/tlb.scala b/rocket/src/main/scala/tlb.scala
index 330c5989..478dd8f2 100644
--- a/rocket/src/main/scala/tlb.scala
+++ b/rocket/src/main/scala/tlb.scala
@@ -10,6 +10,7 @@ import scala.math._
 case object NTLBEntries extends Field[Int]
 
 abstract trait TLBParameters extends CoreParameters {
+  val addrMap = new AddrHashMap(params(NastiAddrMap))
   val entries = params(NTLBEntries)
   val camAddrBits = ceil(log(entries)/log(2)).toInt
   val camTagBits = asIdBits + vpnBits
@@ -167,7 +168,6 @@ class TLB extends TLBModule {
     plru.access(OHToUInt(tag_cam.io.hits))
   }
 
-  val addrMap = params(NASTIAddrHashMap)
   val paddr = Cat(io.resp.ppn, UInt(0, pgIdxBits))
   val addr_ok = addrMap.isValid(paddr)
   val addr_prot = addrMap.getProt(paddr)