Fix FSM full restarts