Fixed bug with client servers