diff --git a/OsmAnd/src/net/osmand/OsmAndFormatter.java b/OsmAnd/src/net/osmand/OsmAndFormatter.java
index 4a6c8258e4..12343ae632 100644
--- a/OsmAnd/src/net/osmand/OsmAndFormatter.java
+++ b/OsmAnd/src/net/osmand/OsmAndFormatter.java
@@ -72,12 +72,12 @@ public class OsmAndFormatter {
 		} else {
 			if (mc == MetricsConstants.KILOMETERS_AND_METERS) {
 				return ((int) meters) + " " + ctx.getString(R.string.m); //$NON-NLS-1$
-			} else if (mc == MetricsConstants.MILES_AND_YARDS) {
-				int yards = (int) (meters * YARDS_IN_ONE_METER);
-				return yards + " " + ctx.getString(R.string.yard); //$NON-NLS-1$
 			} else if (mc == MetricsConstants.MILES_AND_FOOTS) {
 				int foots = (int) (meters * FOOTS_IN_ONE_METER);
 				return foots + " " + ctx.getString(R.string.foot); //$NON-NLS-1$
+			} else if (mc == MetricsConstants.MILES_AND_YARDS) {
+				int yards = (int) (meters * YARDS_IN_ONE_METER);
+				return yards + " " + ctx.getString(R.string.yard); //$NON-NLS-1$
 			}
 			return ((int) meters) + " " + ctx.getString(R.string.m); //$NON-NLS-1$
 		}
diff --git a/OsmAnd/src/net/osmand/plus/OsmandSettings.java b/OsmAnd/src/net/osmand/plus/OsmandSettings.java
index e228c18a06..4efcb5f9c7 100644
--- a/OsmAnd/src/net/osmand/plus/OsmandSettings.java
+++ b/OsmAnd/src/net/osmand/plus/OsmandSettings.java
@@ -1267,8 +1267,8 @@ public class OsmandSettings {
 	
 	public enum MetricsConstants {
 	    KILOMETERS_AND_METERS(R.string.si_km_m,"km-m"),
-		MILES_AND_YARDS(R.string.si_mi_yard,"mi-y"),
-		MILES_AND_FOOTS(R.string.si_mi_foots,"mi-f");
+		MILES_AND_FOOTS(R.string.si_mi_foots,"mi-f"),
+		MILES_AND_YARDS(R.string.si_mi_yard,"mi-y");
 		
 		private final int key;
 		private final String ttsString;