diff --git a/sim_pipeline.py b/sim_pipeline.py
index ba16899..931dd3b 100644
--- a/sim_pipeline.py
+++ b/sim_pipeline.py
@@ -46,12 +46,12 @@ class Streams_Crossbar(Module):
             "WAIT_HEADER",
             NextValue(self.stream_id, mux.source.dchar),
             If(mux.source.stb,
-                NextState("STREAM"),
+                NextState("COPY"),
             ),
         )
 
         fsm.act(
-            "STREAM",
+            "COPY",
             Case(self.stream_id, case),
             If(mux.source.eop,
                 NextState("SWITCH_CONN"),
@@ -223,9 +223,9 @@ class Stream_Parser(Module):
 
         fsm.act(
             "GET_PAK_TAG",
+            self.sink.ack.eq(1),
             If(
                 self.sink.stb,
-                self.sink.ack.eq(1),
                 NextValue(self.pak_tag, self.sink.dchar),
                 NextState("GET_PAK_SIZE_0"),
             ),