SimulatorLI fix