Fixed regression from simulated event workaround.