diff --git a/OsmAnd-java/src/main/java/net/osmand/router/GeneralRouter.java b/OsmAnd-java/src/main/java/net/osmand/router/GeneralRouter.java
index 5f51fa02cc..be5bba2f5f 100644
--- a/OsmAnd-java/src/main/java/net/osmand/router/GeneralRouter.java
+++ b/OsmAnd-java/src/main/java/net/osmand/router/GeneralRouter.java
@@ -620,9 +620,7 @@ public class GeneralRouter implements VehicleRouter {
 	public double calculateTurnTime(RouteSegment segment, int segmentEnd, RouteSegment prev, int prevSegmentEnd) {
 		float ts = getPenaltyTransition(segment.getRoad());
 		float prevTs = getPenaltyTransition(prev.getRoad());
-		
 		float totalPenalty = 0;
-
 		if (prevTs != ts) {
 			totalPenalty += Math.abs(ts - prevTs) / 2;
 		}
@@ -638,7 +636,9 @@ public class GeneralRouter implements VehicleRouter {
 //				}
 //			}
 //		}
-		
+		if (shortestRoute) {
+			return totalPenalty;
+		}
 		if(segment.getRoad().roundabout() && !prev.getRoad().roundabout()) {
 			double rt = getRoundaboutTurn();
 			if(rt > 0) {
@@ -652,7 +652,7 @@ public class GeneralRouter implements VehicleRouter {
 			// more like UT
 			if (diff > 2 * Math.PI / 3) {
 				totalPenalty += getLeftTurn();
-			} else if (diff > Math.PI / 2.1) {
+			} else if (diff > Math.PI / 3) {
 				totalPenalty += getRightTurn();
 			}
 		}