Fixed for new server addresses