Further tweak restarting