Simulation bugfix