Fix quitting an restarting