diff --git a/brouter-core/src/main/java/btools/router/OsmTrack.java b/brouter-core/src/main/java/btools/router/OsmTrack.java
index 9ccff98..c336c38 100644
--- a/brouter-core/src/main/java/btools/router/OsmTrack.java
+++ b/brouter-core/src/main/java/btools/router/OsmTrack.java
@@ -498,7 +498,8 @@ public final class OsmTrack {
       node = node.origin;
     }
 
-    VoiceHintProcessor vproc = new VoiceHintProcessor(rc.turnInstructionCatchingRange, rc.turnInstructionRoundabouts);
+    int transportMode = voiceHints.transportMode();
+    VoiceHintProcessor vproc = new VoiceHintProcessor(rc.turnInstructionCatchingRange, rc.turnInstructionRoundabouts, transportMode);
     List<VoiceHint> results = vproc.process(inputs);
 
     double minDistance = getMinDistance();
@@ -511,13 +512,12 @@ public final class OsmTrack {
 
   int getMinDistance() {
     if (voiceHints != null) {
-      switch (voiceHints.getTransportMode()) {
-        case "car":
+      switch (voiceHints.transportMode()) {
+        case VoiceHintList.TRANS_MODE_CAR:
           return 20;
-        case "bike":
-          return 5;
-        case "foot":
+        case VoiceHintList.TRANS_MODE_FOOT:
           return 3;
+        case VoiceHintList.TRANS_MODE_BIKE:
         default:
           return 5;
       }
diff --git a/brouter-core/src/main/java/btools/router/VoiceHintList.java b/brouter-core/src/main/java/btools/router/VoiceHintList.java
index 215d2f7..e377e24 100644
--- a/brouter-core/src/main/java/btools/router/VoiceHintList.java
+++ b/brouter-core/src/main/java/btools/router/VoiceHintList.java
@@ -30,11 +30,17 @@ public class VoiceHintList {
 
   public String getTransportMode() {
     String ret;
-    switch(transportMode) {
-      case TRANS_MODE_FOOT: ret = "foot"; break;
-      case TRANS_MODE_CAR : ret = "car"; break;
+    switch (transportMode) {
+      case TRANS_MODE_FOOT:
+        ret = "foot";
+        break;
+      case TRANS_MODE_CAR:
+        ret = "car";
+        break;
       case TRANS_MODE_BIKE:
-      default: ret = "bike";
+      default:
+        ret = "bike";
+        break;
     }
     return ret;
   }