diff --git a/src/refit/message/REFITKeyManager.java b/src/refit/message/REFITKeyManager.java
index 98dd0b81f95b79f217a79bf440ee456aa786669d..11ea910366c14edd4b9fb2f7ca8475f81733bc78 100644
--- a/src/refit/message/REFITKeyManager.java
+++ b/src/refit/message/REFITKeyManager.java
@@ -121,7 +121,7 @@ public class REFITKeyManager {
 			System.exit(1);
 		}
 
-		int maxGroupId = Math.max(4, REFITStewardGroups.stewardOrderGroupCount());
+		int maxGroupId = REFITStewardGroups.stewardOrderGroupCount();
 		ThresholdKeyPair[] keyPairs = new ThresholdKeyPair[maxGroupId];
 
 		for (int i = 0; i < maxGroupId; i++) {
@@ -203,7 +203,8 @@ public class REFITKeyManager {
 		String filename = getKeyPath(KeyType.THRESHOLD, 3 * REFITConfig.FAULTS_TO_TOLERATE + 1);
 		DataOutputStream dat = new DataOutputStream(new BufferedOutputStream(new FileOutputStream(filename)));
 
-		for (int i = 0; i < REFITStewardGroups.stewardOrderGroupCount(); i++) {
+		int maxGroupId = Math.max(4, REFITStewardGroups.stewardOrderGroupCount());
+		for (int i = 0; i < maxGroupId; i++) {
 			Dealer dealer = generateThresholdKey();
 			GroupKey groupKey = dealer.getGroupKey();
 			KeyShare[] shares = dealer.getShares();