diff --git a/OsmAnd/src/net/osmand/plus/helpers/WaypointHelper.java b/OsmAnd/src/net/osmand/plus/helpers/WaypointHelper.java
index cd51c1eb7f..c8fdf604c7 100644
--- a/OsmAnd/src/net/osmand/plus/helpers/WaypointHelper.java
+++ b/OsmAnd/src/net/osmand/plus/helpers/WaypointHelper.java
@@ -335,15 +335,15 @@ public class WaypointHelper {
 								point.getLatitude(), point.getLongitude()) - lwp.getDeviationDistance());
 						Integer state = locationPointsStates.get(point);
 						if (state != null && state.intValue() == ANNOUNCED_ONCE
-								&& getVoiceRouter().isDistanceLess(lastKnownLocation.getSpeed(), d1, SHORT_ANNOUNCE_RADIUS)) {
+								&& getVoiceRouter().isDistanceLess(lastKnownLocation.getSpeed(), d1, SHORT_ANNOUNCE_RADIUS, 0f)) {
 							locationPointsStates.put(point, ANNOUNCED_DONE);
 							announcePoints.add(lwp);
 						} else if (type != ALARMS && (state == null || state == NOT_ANNOUNCED)
-								&& getVoiceRouter().isDistanceLess(lastKnownLocation.getSpeed(), d1, LONG_ANNOUNCE_RADIUS)) {
+								&& getVoiceRouter().isDistanceLess(lastKnownLocation.getSpeed(), d1, LONG_ANNOUNCE_RADIUS, 0f)) {
 							locationPointsStates.put(point, ANNOUNCED_ONCE);
 							approachPoints.add(lwp);
 						} else if (type == ALARMS && (state == null || state == NOT_ANNOUNCED)
-								&& getVoiceRouter().isDistanceLess(lastKnownLocation.getSpeed(), d1, ALARMS_ANNOUNCE_RADIUS)) {
+								&& getVoiceRouter().isDistanceLess(lastKnownLocation.getSpeed(), d1, ALARMS_ANNOUNCE_RADIUS, 0f)) {
 							locationPointsStates.put(point, ANNOUNCED_ONCE);
 							approachPoints.add(lwp);
 						}
diff --git a/OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java b/OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java
index 12620c10c6..188810e295 100644
--- a/OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java
+++ b/OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java
@@ -695,12 +695,12 @@ public class RoutingHelper {
 		}
 	}
 	
-	protected boolean isDistanceLess(float currentSpeed, double dist, double etalon, double defSpeed){
-		if(dist < etalon || ((dist / currentSpeed) < (etalon / defSpeed))){
-			return true;
-		}
-		return false;
-	}
+//	protected boolean isDistanceLess(float currentSpeed, double dist, double etalon, float defSpeed){
+//		if(dist < etalon || ((dist / currentSpeed) < (etalon / defSpeed))){
+//			return true;
+//		}
+//		return false;
+//	}
 	
 	public synchronized String getCurrentName(TurnType[] next){
 		NextDirectionInfo n = getNextRouteDirectionInfo(new NextDirectionInfo(), false);
@@ -710,7 +710,7 @@ public class RoutingHelper {
 			speed = l.getSpeed();
 		}
 		if(n.distanceTo > 0  && n.directionInfo != null && !n.directionInfo.getTurnType().isSkipToSpeak() && 
-				voiceRouter.isDistanceLess(speed, n.distanceTo, voiceRouter.PREPARE_DISTANCE * 0.75f)) {
+				voiceRouter.isDistanceLess(speed, n.distanceTo, voiceRouter.PREPARE_DISTANCE * 0.75f, 0f)) {
 			String nm = n.directionInfo.getStreetName();
 			String rf = n.directionInfo.getRef();
 			String dn = n.directionInfo.getDestinationName();
diff --git a/OsmAnd/src/net/osmand/plus/routing/VoiceRouter.java b/OsmAnd/src/net/osmand/plus/routing/VoiceRouter.java
index 69015b4664..4e7c8b8c59 100644
--- a/OsmAnd/src/net/osmand/plus/routing/VoiceRouter.java
+++ b/OsmAnd/src/net/osmand/plus/routing/VoiceRouter.java
@@ -166,29 +166,25 @@ public class VoiceRouter {
 		}
 	}
 	
-	public boolean isDistanceLess(float currentSpeed, double dist, double etalon){
+	public boolean isDistanceLess(float currentSpeed, double dist, double etalon, float defSpeed){
+		if(defSpeed <= 0) {
+			defSpeed = DEFAULT_SPEED;
+		}
 		if(currentSpeed <= 0) {
 			currentSpeed = DEFAULT_SPEED;
 		}
-		if(dist < etalon || ((dist / currentSpeed) < (etalon / DEFAULT_SPEED))){
-			return true;
-		}
-		return false;
-	}
-	
-	protected boolean isDistanceLess(float currentSpeed, double dist, double etalon, double defSpeed){
 		if(dist < etalon || ((dist / currentSpeed) < (etalon / defSpeed))){
 			return true;
 		}
 		return false;
 	}
-	
+
 	public int calculateImminent(float dist, Location loc){
 		float speed = DEFAULT_SPEED;
 		if(loc != null && loc.hasSpeed()) {
 			speed = loc.getSpeed();
 		}
-		if (isDistanceLess(speed, dist, TURN_IN_DISTANCE_END)) {
+		if (isDistanceLess(speed, dist, TURN_IN_DISTANCE_END, 0f)) {
 			return 0;
 		} else if ( dist <= PREPARE_DISTANCE) {
 			return 1;
@@ -439,11 +435,11 @@ public class VoiceRouter {
 
 		// say how much to go if there is next turn is a bit far
 		if (currentStatus == STATUS_UNKNOWN) {
-			if (!isDistanceLess(speed, dist, TURN_IN_DISTANCE * 1.3)) {
+			if (!isDistanceLess(speed, dist, TURN_IN_DISTANCE * 1.3, 0f)) {
 				playGoAheadDist = dist - 80;
 			}
 			// say long distance message only for long distances > 10 km
-			// if (dist >= PREPARE_LONG_DISTANCE && !isDistanceLess(speed, dist, PREPARE_LONG_DISTANCE)) {
+			// if (dist >= PREPARE_LONG_DISTANCE && !isDistanceLess(speed, dist, PREPARE_LONG_DISTANCE, 0f)) {
 			if (dist > PREPARE_LONG_DISTANCE + 300) {
 				nextStatusAfter(STATUS_UNKNOWN);
 			} else if (dist > PREPARE_DISTANCE + 300) {
@@ -466,9 +462,9 @@ public class VoiceRouter {
 				andSpeakArriveAtPoint(nextNextInfo);
 			}
 			nextStatusAfter(STATUS_TURN);
-		} else if ((repeat || statusNotPassed(STATUS_TURN_IN)) && isDistanceLess(speed, dist, TURN_IN_DISTANCE)) {
+		} else if ((repeat || statusNotPassed(STATUS_TURN_IN)) && isDistanceLess(speed, dist, TURN_IN_DISTANCE, 0f)) {
 			if (repeat || dist >= TURN_IN_DISTANCE_END) {
-				if ((isDistanceLess(speed, next.distance, TURN_DISTANCE) || next.distance < TURN_IN_DISTANCE_END) &&
+				if ((isDistanceLess(speed, next.distance, TURN_DISTANCE, 0f) || next.distance < TURN_IN_DISTANCE_END) &&
 						nextNextInfo != null) {
 					playMakeTurnIn(currentSegment, next, dist, nextNextInfo.directionInfo);
 				} else {
@@ -477,7 +473,7 @@ public class VoiceRouter {
 				playAndArriveAtDestination(repeat, nextInfo, currentSegment);
 			}
 			nextStatusAfter(STATUS_TURN_IN);
-			// } else if (statusNotPassed(STATUS_PREPARE) && isDistanceLess(speed, dist, PREPARE_DISTANCE)) {
+			// } else if (statusNotPassed(STATUS_PREPARE) && isDistanceLess(speed, dist, PREPARE_DISTANCE, 0f)) {
 		} else if ((repeat || statusNotPassed(STATUS_PREPARE)) && (dist <= PREPARE_DISTANCE)) {
 			if (repeat || dist >= PREPARE_DISTANCE_END) {
 				if (!repeat && (next.getTurnType().keepLeft() || next.getTurnType().keepRight())){
@@ -488,7 +484,7 @@ public class VoiceRouter {
 				}
 			}
 			nextStatusAfter(STATUS_PREPARE);
-			// } else if (statusNotPassed(STATUS_LONG_PREPARE) && isDistanceLess(speed, dist, PREPARE_LONG_DISTANCE)){
+			// } else if (statusNotPassed(STATUS_LONG_PREPARE) && isDistanceLess(speed, dist, PREPARE_LONG_DISTANCE, 0f)){
 		} else if ((repeat || statusNotPassed(STATUS_LONG_PREPARE)) && (dist <= PREPARE_LONG_DISTANCE)) {
 			if (repeat || dist >= PREPARE_LONG_DISTANCE_END) {
 				playPrepareTurn(currentSegment, next, dist);