Fixed behaviour on simulation reset