diff --git a/mixnet/v2/sim/p2p.py b/mixnet/v2/sim/p2p.py
index 452aff7..22fb013 100644
--- a/mixnet/v2/sim/p2p.py
+++ b/mixnet/v2/sim/p2p.py
@@ -19,7 +19,10 @@ class P2p:
         self.log("Broadcasting a msg: %d bytes" % len(msg))
         self.message_sizes.append(len(msg))
 
-        yield self.env.timeout(1)
+        # Yield 0 to ensure that the broadcast is done in the same time step.
+        # Without this, SimPy complains that the broadcast func is not a generator.
+        yield self.env.timeout(0)
+
         # TODO: gossipsub or something similar
         for node in self.nodes:
             self.env.process(node.receive_message(msg))