Fixes a potential problem with server addresses