Fix new ServerLink bug when running in batch