diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/SaveAsTrackBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/mapmarkers/SaveAsTrackBottomSheetDialogFragment.java
index 1c8a143c82..8ce54e1fd5 100644
--- a/OsmAnd/src/net/osmand/plus/mapmarkers/SaveAsTrackBottomSheetDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapmarkers/SaveAsTrackBottomSheetDialogFragment.java
@@ -49,8 +49,9 @@ public class SaveAsTrackBottomSheetDialogFragment extends BottomSheetDialogFragm
 	public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 		boolean isCoordInput = false;
 		int number = 0;
-		if (getArguments() != null) {
-			number = getArguments().getInt(ADDED_MARKERS_NUMBER_KEY);
+		Bundle args = getArguments();
+		if (args != null) {
+			number = args.getInt(ADDED_MARKERS_NUMBER_KEY);
 			if (number != 0)
 				isCoordInput = true;
 		}
diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/adapters/CoordinateInputAdapter.java b/OsmAnd/src/net/osmand/plus/mapmarkers/adapters/CoordinateInputAdapter.java
index 268c574b77..4d9f5e1831 100644
--- a/OsmAnd/src/net/osmand/plus/mapmarkers/adapters/CoordinateInputAdapter.java
+++ b/OsmAnd/src/net/osmand/plus/mapmarkers/adapters/CoordinateInputAdapter.java
@@ -22,7 +22,7 @@ import java.util.List;
 
 public class CoordinateInputAdapter extends RecyclerView.Adapter<MapMarkerItemViewHolder> {
 
-	public static final String ADAPTER_POSITION = "position";
+	public static final String ADAPTER_POSITION = "adapter_position";
 
 	private OsmandApplication app;
 	private List<MapMarker> mapMarkers;