diff --git a/src/main/scala/backBoard/shin/MasterParser.scala b/src/main/scala/backBoard/shin/MasterParser.scala
index 9c5fc0e..3d8b1b2 100644
--- a/src/main/scala/backBoard/shin/MasterParser.scala
+++ b/src/main/scala/backBoard/shin/MasterParser.scala
@@ -150,8 +150,8 @@ abstract class MasterParserBase extends Module{
 
 
 
-  io.rxEnq := io.downOut.fire & io.downOut.bits.tlast
-  io.txDeq := io.upIn.fire    & io.upIn.bits.tlast
+  io.rxEnq := io.upIn.fire    & io.upIn.bits.tlast
+  io.txDeq := io.downOut.fire & io.downOut.bits.tlast
 
 
 
diff --git a/src/main/scala/backBoard/shin/SMUnit.scala b/src/main/scala/backBoard/shin/SMUnit.scala
index b0a407e..befeb8e 100644
--- a/src/main/scala/backBoard/shin/SMUnit.scala
+++ b/src/main/scala/backBoard/shin/SMUnit.scala
@@ -50,10 +50,12 @@ abstract class SMUnitBase(depth: Int = 4) extends Module {
 
   when( io.enq ){
     wPtr := wPtr + 1.U
+    assert( ~isFull)
   }
 
   when( io.deq ){
     rPtr := rPtr + 1.U
+    assert( ~isEmpty )
   }
 
   for( i <- 0 until depth ){