Fix restarts