Simulator fix