Fixing the simulator.