More robust restarting