fix fetching the server name