diff --git a/ebclibrary/src/main/java/org/mpisws/encounters/encounterformation/simulator/SimulatorEncounterFormationCore.java b/ebclibrary/src/main/java/org/mpisws/encounters/encounterformation/simulator/SimulatorEncounterFormationCore.java
index a121c18bc2c5d4eac04da824bf18a547a62b09db..975829c58bd60aacf88f56e95515e0fc490f9b77 100644
--- a/ebclibrary/src/main/java/org/mpisws/encounters/encounterformation/simulator/SimulatorEncounterFormationCore.java
+++ b/ebclibrary/src/main/java/org/mpisws/encounters/encounterformation/simulator/SimulatorEncounterFormationCore.java
@@ -35,7 +35,7 @@ import static org.mpisws.encounters.EncounterBasedCommunication.CHANGE_EPOCH_TIM
 public class SimulatorEncounterFormationCore implements Runnable {
     private static final String TAG = SimulatorEncounterFormationCore.class.getSimpleName();
     public static final int NUM_SIMULATED_DEVICES = 10;
-    private static final int NUM_SIMULATED_EPOCHS = 20;
+    public static final int NUM_SIMULATED_EPOCHS = 20;
     protected static List<Identifier> mDHPubKeys = new ArrayList<>(NUM_SIMULATED_EPOCHS);
     protected static List<Identifier> mDHNonces = new ArrayList<>(NUM_SIMULATED_EPOCHS);
     protected static List<Identifier> mDHFullKeys = new ArrayList<>(NUM_SIMULATED_EPOCHS);
diff --git a/testapp/src/main/java/org/mpisws/testapp/SimulationServer.java b/testapp/src/main/java/org/mpisws/testapp/SimulationServer.java
index 8c127a6003525cc65b4dc1e7f0056e0512169859..32803c3f2cb84db0a5ae99774a9c9bb4fd89c817 100644
--- a/testapp/src/main/java/org/mpisws/testapp/SimulationServer.java
+++ b/testapp/src/main/java/org/mpisws/testapp/SimulationServer.java
@@ -26,6 +26,7 @@ import java.util.List;
 
 import static org.mpisws.encounters.EncounterBasedCommunication.CHANGE_EPOCH_TIME;
 import static org.mpisws.encounters.encounterformation.simulator.SimulatorEncounterFormationCore.NUM_SIMULATED_DEVICES;
+import static org.mpisws.encounters.encounterformation.simulator.SimulatorEncounterFormationCore.NUM_SIMULATED_EPOCHS;
 import static org.mpisws.helpers.Utils.SHA1;
 
 public class SimulationServer {
@@ -122,6 +123,8 @@ public class SimulationServer {
             }
             ESClient.getInstance().sendMsgs(msgsToSend);
             currentEpoch++;
+            // heh hack
+            if (currentEpoch == NUM_SIMULATED_EPOCHS) currentEpoch--;
         }, CHANGE_EPOCH_TIME);
     }