Fix multiple servers