diff --git a/OsmAnd/src/net/osmand/plus/OsmandSettings.java b/OsmAnd/src/net/osmand/plus/OsmandSettings.java
index 56acbfe24b..1f23e794b3 100644
--- a/OsmAnd/src/net/osmand/plus/OsmandSettings.java
+++ b/OsmAnd/src/net/osmand/plus/OsmandSettings.java
@@ -1071,11 +1071,7 @@ public class OsmandSettings {
 		List<String> list = new ArrayList<String>();
 		String ip = settingsAPI.getString(globalPreferences,INTERMEDIATE_POINTS_DESCRIPTION, "");
 		if (ip.trim().length() > 0) {
-			StringTokenizer tok = new StringTokenizer(ip, "--");
-			while (tok.hasMoreTokens()) {
-				String d = tok.nextToken();
-				list.add(d);
-			}
+			list.addAll(Arrays.asList(ip.split("--")));
 		}
 		while(list.size() < sz) {
 			list.add("");