diff --git a/cmd/admin-handlers.go b/cmd/admin-handlers.go
index 47aa089c9..fa17e6ddd 100644
--- a/cmd/admin-handlers.go
+++ b/cmd/admin-handlers.go
@@ -2713,7 +2713,7 @@ func appendClusterMetaInfoToZip(ctx context.Context, zipWriter *zip.Writer) {
 	go func() {
 		ci := clusterInfo{}
 		ci.Info.PoolsCount = len(globalEndpoints)
-		ci.Info.ServersCount = globalEndpoints.NEndpoints()
+		ci.Info.ServersCount = len(globalEndpoints.Hostnames())
 		ci.Info.MinioVersion = Version
 
 		si, _ := objectAPI.StorageInfo(ctx)
diff --git a/cmd/endpoint.go b/cmd/endpoint.go
index 5e4f80a49..9a1f2ce9b 100644
--- a/cmd/endpoint.go
+++ b/cmd/endpoint.go
@@ -315,7 +315,7 @@ func (l EndpointServerPools) HTTPS() bool {
 	return l[0].Endpoints.HTTPS()
 }
 
-// NEndpoints - returns all nodes count
+// NEndpoints - returns number of endpoints
 func (l EndpointServerPools) NEndpoints() (count int) {
 	for _, ep := range l {
 		count += len(ep.Endpoints)