diff --git a/libs/surfaces/contourdesign/contourdesign.cc b/libs/surfaces/contourdesign/contourdesign.cc
index 2895f58c3c..96d114f250 100644
--- a/libs/surfaces/contourdesign/contourdesign.cc
+++ b/libs/surfaces/contourdesign/contourdesign.cc
@@ -562,7 +562,7 @@ ContourDesignControlProtocol::prev_marker_keep_rolling ()
 	timepos_t pos = _session->locations()->first_mark_before (timepos_t (_session->transport_sample()));
 
 	if (pos.positive() || pos.zero()) {
-		_session->request_locate (pos.samples());
+		locate (pos.samples());
 	} else {
 		_session->goto_start ();
 	}
@@ -574,7 +574,7 @@ ContourDesignControlProtocol::next_marker_keep_rolling ()
 	timepos_t pos = _session->locations()->first_mark_after (timepos_t (_session->transport_sample()));
 
 	if (pos.positive() || pos.zero()) {
-		_session->request_locate (pos.samples());
+		locate (pos.samples());
 	} else {
 		_session->goto_end();
 	}
diff --git a/libs/surfaces/control_protocol/control_protocol/basic_ui.h b/libs/surfaces/control_protocol/control_protocol/basic_ui.h
index f321c4aaa7..c034754658 100644
--- a/libs/surfaces/control_protocol/control_protocol/basic_ui.h
+++ b/libs/surfaces/control_protocol/control_protocol/basic_ui.h
@@ -71,7 +71,7 @@ class LIBCONTROLCP_API BasicUI {
 	void jump_by_beats (int beats, LocateTransportDisposition ltd = RollIfAppropriate);
 
 	samplepos_t transport_sample ();
-	void locate (samplepos_t sample, LocateTransportDisposition ltd);
+	void locate (samplepos_t sample, LocateTransportDisposition ltd = RollIfAppropriate);
 	void locate (samplepos_t sample, bool);
 	bool locating ();
 	bool locked ();
diff --git a/libs/surfaces/faderport8/actions.cc b/libs/surfaces/faderport8/actions.cc
index a4ce4017a4..8a7e33b5a7 100644
--- a/libs/surfaces/faderport8/actions.cc
+++ b/libs/surfaces/faderport8/actions.cc
@@ -309,7 +309,7 @@ FaderPort8::button_varispeed (bool ffw)
 		// stop key-repeat
 		dynamic_cast<FP8RepeatButton*>(&b_ffw)->stop_repeat();
 		dynamic_cast<FP8RepeatButton*>(&b_rew)->stop_repeat();
-		_session->request_locate (0, MustStop);
+		locate (0, MustStop);
 		return;
 	}
 
diff --git a/libs/surfaces/osc/osc.cc b/libs/surfaces/osc/osc.cc
index 2ddb020439..c8b634eb8d 100644
--- a/libs/surfaces/osc/osc.cc
+++ b/libs/surfaces/osc/osc.cc
@@ -1305,7 +1305,7 @@ OSC::osc_toggle_roll (bool ret2strt)
 	} else {
 
 		if (_session->get_play_loop() && Config->get_loop_is_mode()) {
-			_session->request_locate (_session->locations()->auto_loop_location()->start().samples(), MustRoll);
+			locate (_session->locations()->auto_loop_location()->start().samples(), MustRoll);
 		} else {
 			_session->request_roll (TRS_UI);
 		}
@@ -3149,7 +3149,7 @@ OSC::set_marker (const char* types, lo_arg **argv, int argc, lo_message msg)
 				for (Locations::LocationList::const_iterator l = ll.begin(); l != ll.end(); ++l) {
 					if ((*l)->is_mark ()) {
 						if (strcmp (&argv[0]->s, (*l)->name().c_str()) == 0) {
-							_session->request_locate ((*l)->start_sample (), MustStop);
+							locate ((*l)->start_sample (), MustStop);
 							return 0;
 						} else if ((*l)->start () == _session->transport_sample()) {
 							cur_mark = (*l);
@@ -3186,7 +3186,7 @@ OSC::set_marker (const char* types, lo_arg **argv, int argc, lo_message msg)
 	std::sort (lm.begin(), lm.end(), location_marker_sort);
 	// go there
 	if (marker < lm.size()) {
-		_session->request_locate (lm[marker].when, MustStop);
+		locate (lm[marker].when, MustStop);
 		return 0;
 	}
 	// we were unable to deal with things
@@ -5935,7 +5935,7 @@ OSC::periodic (void)
 		if (diff > 120000) {
 			scrub_speed = 0;
 			// locate to the place PH was at last tick
-			_session->request_locate (scrub_place, MustStop);
+			locate (scrub_place, MustStop);
 		}
 	}
 	for (uint32_t it = 0; it < _surface.size(); it++) {
diff --git a/libs/surfaces/tranzport/general.cc b/libs/surfaces/tranzport/general.cc
index 44dc8faf9e..efdf7e3458 100644
--- a/libs/surfaces/tranzport/general.cc
+++ b/libs/surfaces/tranzport/general.cc
@@ -184,7 +184,7 @@ TranzportControlProtocol::prev_marker ()
 	Location *location = session->locations()->first_location_before (session->transport_sample());
 
 	if (location) {
-		session->request_locate (location->start());
+		locate (location->start());
 		notify(location->name().c_str());
 	} else {
 		session->goto_start ();
@@ -199,10 +199,10 @@ TranzportControlProtocol::next_marker ()
 	Location *location = session->locations()->first_location_after (session->transport_sample());
 
 	if (location) {
-		session->request_locate (location->start());
+		locate (location->start());
 		notify(location->name().c_str());
 	} else {
-		session->request_locate (session->current_end_sample());
+		locate (session->current_end_sample());
 		notify("END ");
 	}
 }