Simulation fix