Simulation fixed