fixes a problem with the waitFor(SimulationEntity e) interfering with waitForTrigger(TriggerQueue q).
merged