diff --git a/weed/command/master.go b/weed/command/master.go
index e56ee19fe..3d69f4216 100644
--- a/weed/command/master.go
+++ b/weed/command/master.go
@@ -134,7 +134,7 @@ func startMaster(masterOption MasterOptions, masterWhiteList []string) {
 
 	masterPeers := make(map[string]pb.ServerAddress)
 	for _, peer := range peers {
-		masterPeers[peer.String()] = peer
+		masterPeers[string(peer)] = peer
 	}
 
 	r := mux.NewRouter()
diff --git a/weed/pb/server_address.go b/weed/pb/server_address.go
index c7faea4bd..a66d0d831 100644
--- a/weed/pb/server_address.go
+++ b/weed/pb/server_address.go
@@ -89,7 +89,7 @@ func (sa ServerAddresses) ToAddresses() (addresses []ServerAddress) {
 func (sa ServerAddresses) ToAddressMap() (addresses map[string]ServerAddress) {
 	addresses = make(map[string]ServerAddress)
 	for _, address := range sa.ToAddresses() {
-		addresses[address.String()] = address
+		addresses[string(address)] = address
 	}
 	return
 }