diff --git a/brouter-core/src/main/java/btools/router/RoutingContext.java b/brouter-core/src/main/java/btools/router/RoutingContext.java
index 045ac0c..888da30 100644
--- a/brouter-core/src/main/java/btools/router/RoutingContext.java
+++ b/brouter-core/src/main/java/btools/router/RoutingContext.java
@@ -77,7 +77,6 @@ public final class RoutingContext {
   public boolean correctMisplacedViaPoints;
   public double correctMisplacedViaPointsDistance;
   public boolean useDynamicDistance;
-  public int roundTripPoints;
 
   private void setModel(String className) {
     if (className == null) {
@@ -172,11 +171,6 @@ public final class RoutingContext {
 
     useDynamicDistance = expctxGlobal.getVariableValue("use_dynamic_range", 0f) == 1f;
 
-    roundTripPoints = (int) expctxGlobal.getVariableValue("roundTripPoints", 5.f);
-    if (roundTripPoints < 3 || roundTripPoints > 20) {
-      roundTripPoints = 5;
-    }
-
     boolean test = expctxGlobal.getVariableValue("check_start_way", 1f) == 1f;
     if (!test) freeNoWays();
 
@@ -199,6 +193,7 @@ public final class RoutingContext {
   public boolean forceUseStartDirection;
   public Integer roundtripDistance;
   public Integer roundtripDirectionAdd;
+  public Integer roundTripPoints;
   public boolean allowSamewayback;
 
   public CheapAngleMeter anglemeter = new CheapAngleMeter();
diff --git a/brouter-core/src/main/java/btools/router/RoutingParamCollector.java b/brouter-core/src/main/java/btools/router/RoutingParamCollector.java
index a169f07..05dab70 100644
--- a/brouter-core/src/main/java/btools/router/RoutingParamCollector.java
+++ b/brouter-core/src/main/java/btools/router/RoutingParamCollector.java
@@ -206,6 +206,11 @@ public class RoutingParamCollector {
           rctx.roundtripDistance = Integer.valueOf(value);
         } else if (key.equals("roundtripDirectionAdd")) {
           rctx.roundtripDirectionAdd = Integer.valueOf(value);
+        } else if (key.equals("roundTripPoints")) {
+          rctx.roundTripPoints = Integer.valueOf(value);
+          if (rctx.roundTripPoints == null || rctx.roundTripPoints < 3 || rctx.roundTripPoints > 20) {
+            rctx.roundTripPoints = 5;
+          }
         } else if (key.equals("allowSamewayback")) {
           rctx.allowSamewayback = Integer.parseInt(value)==1;
         } else if (key.equals("alternativeidx")) {