Fully deterministic simulation fix