Restart workaround