diff --git a/OsmAnd/src/net/osmand/plus/OsmandSettings.java b/OsmAnd/src/net/osmand/plus/OsmandSettings.java
index 1fafbbd6fd..895f6fb91d 100644
--- a/OsmAnd/src/net/osmand/plus/OsmandSettings.java
+++ b/OsmAnd/src/net/osmand/plus/OsmandSettings.java
@@ -678,11 +678,10 @@ public class OsmandSettings {
 					RouteService.values()).makeProfile();	
 	
 	// this value string is synchronized with settings_pref.xml preference name
-	public final OsmandPreference<AutoZoomMap> AUTO_ZOOM_MAP =
+	public final CommonPreference<AutoZoomMap> AUTO_ZOOM_MAP =
 		new EnumIntPreference<AutoZoomMap>("auto_zoom_map", AutoZoomMap.NONE,
-				AutoZoomMap.values());
+				AutoZoomMap.values()).makeProfile().cache();
 	{
-		AUTO_ZOOM_MAP.makeProfile().cache();
 		AUTO_ZOOM_MAP.setModeDefaultValue(ApplicationMode.CAR, AutoZoomMap.FARTHEST);
 		AUTO_ZOOM_MAP.setModeDefaultValue(ApplicationMode.BICYCLE, AutoZoomMap.NONE);
 		AUTO_ZOOM_MAP.setModeDefaultValue(ApplicationMode.PEDESTRIAN, AutoZoomMap.NONE);
diff --git a/OsmAnd/src/net/osmand/plus/activities/SettingsNavigationActivity.java b/OsmAnd/src/net/osmand/plus/activities/SettingsNavigationActivity.java
index 6c7a9c540a..6991d700c8 100644
--- a/OsmAnd/src/net/osmand/plus/activities/SettingsNavigationActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/SettingsNavigationActivity.java
@@ -7,8 +7,8 @@ import java.util.Set;
 
 import net.osmand.IndexConstants;
 import net.osmand.plus.OsmandSettings;
-import net.osmand.plus.OsmandSettings.OsmandPreference;
 import net.osmand.plus.OsmandSettings.AutoZoomMap;
+import net.osmand.plus.OsmandSettings.OsmandPreference;
 import net.osmand.plus.R;
 import net.osmand.plus.routing.RouteProvider.RouteService;
 import android.app.AlertDialog;