diff --git a/api-webapp/src/main/kotlin/org/jeudego/pairgoth/ext/OpenGotha.kt b/api-webapp/src/main/kotlin/org/jeudego/pairgoth/ext/OpenGotha.kt
index 745e3a4..af2f1fb 100644
--- a/api-webapp/src/main/kotlin/org/jeudego/pairgoth/ext/OpenGotha.kt
+++ b/api-webapp/src/main/kotlin/org/jeudego/pairgoth/ext/OpenGotha.kt
@@ -106,7 +106,7 @@ object OpenGotha {
             handicap = HandicapParams(
                 weight = pairParams.paiSeMinimizeHandicap.toDouble(),
                 useMMS = handParams.hdBasedOnMMS.toBoolean(),
-                rankThreshold = Pairable.parseRank(pairParams.paiSeRankThreshold),
+                rankThreshold = Pairable.parseRank(handParams.hdNoHdRankThreshold),
                 correction = handParams.hdCorrection,
                 ceiling = handParams.hdCeiling
             )
diff --git a/api-webapp/src/main/kotlin/org/jeudego/pairgoth/model/Pairing.kt b/api-webapp/src/main/kotlin/org/jeudego/pairgoth/model/Pairing.kt
index 267acb5..c1104d8 100644
--- a/api-webapp/src/main/kotlin/org/jeudego/pairgoth/model/Pairing.kt
+++ b/api-webapp/src/main/kotlin/org/jeudego/pairgoth/model/Pairing.kt
@@ -95,8 +95,7 @@ data class HandicapParams(
     // minimizeHandicap is a secondary criteria but moved here
     val weight: Double = 0.0, // Should be paiSeDefSecCrit for SwCat, 0 for others
     val useMMS: Boolean = true, // if useMMS is false, hd will be based on rank
-    // When one player in the game has a rank of at least hdNoHdRankThreshold,
-    // then the game will be without handicap
+    // Maximum rank used to compute handicap is rankThreshold
     val rankThreshold: Int = 0, // 0 is 1d
     val correction: Int = 1, // Handicap will be decreased by hdCorrection
     val ceiling: Int = 9, // Possible values are between 0 and 9