diff --git a/cmix/follow.go b/cmix/follow.go
index 25a266081978ca303c7e8fc6f25ac283abff5507..5d1764994d0e0a270f4d93f2153c8de799a3b5e7 100644
--- a/cmix/follow.go
+++ b/cmix/follow.go
@@ -358,7 +358,7 @@ func (c *client) follow(identity receptionID.IdentityUse,
 		if !hasMessage && c.verboseRounds != nil {
 			c.verboseRounds.denote(rid, RoundState(NoMessageAvailable))
 		}
-		//jww.INFO.Printf("[LOOKUP] round %d checked for %d, has message: %s", rid, identity.EphId.Int64(), hasMessage)
+		jww.INFO.Printf("[LOOKUP] round %d checked for %d, has message: %b", rid, identity.EphId.Int64(), hasMessage)
 		return hasMessage
 	}
 
diff --git a/cmix/gateway/hostPool.go b/cmix/gateway/hostPool.go
index 0bf9d5a929a4d02a48a15e7a2f45d8306c8cbcd1..c37dbdf2fdcda4b8f9f8fac7f9339640809e40fe 100644
--- a/cmix/gateway/hostPool.go
+++ b/cmix/gateway/hostPool.go
@@ -14,6 +14,7 @@ package gateway
 
 import (
 	"encoding/json"
+	"math"
 	"sort"
 	"strings"
 	"sync"
@@ -822,10 +823,7 @@ func getPoolSize(ndfLen, maxSize uint32) (uint32, error) {
 			"Unable to create HostPool: no gateways available")
 	}
 
-	// fix-me: this is a HACK to get it working in testnet night of 10/12/2022
-	// DO NOT PUSH TO LIVE - gateway gossip shuffle must be fixed
-	//poolSize := uint32(math.Ceil(math.Sqrt(float64(ndfLen))))
-	poolSize := ndfLen
+	poolSize := uint32(math.Ceil(math.Sqrt(float64(ndfLen))))
 	if poolSize > maxSize {
 		return maxSize, nil
 	}