Fix restarting