Make restarting work