diff --git a/.github/workflows/releases.yml b/.github/workflows/releases.yml
index 670c8e6b..9d021277 100644
--- a/.github/workflows/releases.yml
+++ b/.github/workflows/releases.yml
@@ -26,7 +26,6 @@ jobs:
       - name: Get the version
         id: get_version
         run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//}
-          
 
       - name: Set up Go 1.16beta1
         uses: actions/setup-go@v1
diff --git a/ChangeLog b/ChangeLog
index 7c248bc6..5e76f491 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,7 +9,7 @@
  - `dnscrypt-proxy -resolve` has been completely revamped, and now requires
 the configuration file to be accessible. It will send a query to an IP address
 of the `dnscrypt-proxy` server by default. Sending queries to arbitrary
-servers is also supported with the `-resolve name,address` syntax.
+servers is also supported with the new `-resolve name,address` syntax.
  - Relay lists can be set to `*` for automatic relay selection. When a wildcard
 is used, either for the list of servers or relays, the proxy ensures that
 relays and servers are on distinct networks.
diff --git a/dnscrypt-proxy/serversInfo.go b/dnscrypt-proxy/serversInfo.go
index f6e84104..47f4d655 100644
--- a/dnscrypt-proxy/serversInfo.go
+++ b/dnscrypt-proxy/serversInfo.go
@@ -268,16 +268,17 @@ func fetchServerInfo(proxy *Proxy, name string, stamp stamps.ServerStamp, isNew
 }
 
 func findFarthestRoute(proxy *Proxy, name string, relayStamps []stamps.ServerStamp) *stamps.ServerStamp {
-	var server *RegisteredServer
-	for _, registeredServer := range proxy.registeredServers {
+	serverIdx := -1
+	for i, registeredServer := range proxy.registeredServers {
 		if registeredServer.name == name {
-			server = &registeredServer
+			serverIdx = i
 			break
 		}
 	}
-	if server == nil {
+	if serverIdx < 0 {
 		return nil
 	}
+	server := proxy.registeredServers[serverIdx]
 	serverAddrStr, _ := ExtractHostAndPort(server.stamp.ServerAddrStr, 443)
 	serverAddr := net.ParseIP(serverAddrStr)
 	if serverAddr == nil {