Fix multiple servers handling