diff --git a/junctions/src/main/scala/nasti.scala b/junctions/src/main/scala/nasti.scala
index d01e352f..2d92b49d 100644
--- a/junctions/src/main/scala/nasti.scala
+++ b/junctions/src/main/scala/nasti.scala
@@ -296,7 +296,9 @@ class NASTIArbiter(val arbN: Int) extends NASTIModule {
     io.slave.w.valid := io.master(w_chosen).w.valid && !w_done
 
     io.slave.ar <> ar_arb.io.out
-    io.slave.aw <> aw_arb.io.out
+
+    io.slave.aw.bits <> aw_arb.io.out.bits
+    io.slave.aw.valid := aw_arb.io.out.valid && w_done
     aw_arb.io.out.ready := io.slave.aw.ready && w_done
 
   } else { io.slave <> io.master.head }