diff --git a/libs/surfaces/mackie/mackie_control_protocol.cc b/libs/surfaces/mackie/mackie_control_protocol.cc
index b3fe26c144..be1144e6ac 100644
--- a/libs/surfaces/mackie/mackie_control_protocol.cc
+++ b/libs/surfaces/mackie/mackie_control_protocol.cc
@@ -565,13 +565,13 @@ MackieControlProtocol::initialize()
 			return;
 		}
 		
-		if (!surfaces.front()->active ()) {
+		if (!_master_surface->active ()) {
 			return;
 		}
 		
 		// sometimes the jog wheel is a pot
 		if (_device_info.has_jog_wheel()) {
-			surfaces.front()->blank_jog_ring ();
+			_master_surface->blank_jog_ring ();
 		}
 	}
 
diff --git a/libs/surfaces/mackie/mcp_buttons.cc b/libs/surfaces/mackie/mcp_buttons.cc
index 269d964423..7b45b382e3 100644
--- a/libs/surfaces/mackie/mcp_buttons.cc
+++ b/libs/surfaces/mackie/mcp_buttons.cc
@@ -315,7 +315,8 @@ Mackie::LedState
 MackieControlProtocol::scrub_press (Mackie::Button &)
 {
 	if (!surfaces.empty()) {
-		surfaces.front()->next_jog_mode ();
+		// surfaces.front()->next_jog_mode ();
+		_master_surface->next_jog_mode ();
 	}
 	return none;
 }
@@ -751,7 +752,7 @@ MackieControlProtocol::master_fader_touch_press (Mackie::Button &)
 {
 	DEBUG_TRACE (DEBUG::MackieControl, "MackieControlProtocol::master_fader_touch_press\n");
 
-	Fader* master_fader = surfaces.front()->master_fader();
+	Fader* master_fader = _master_surface->master_fader();
 
 	boost::shared_ptr<AutomationControl> ac = master_fader->control ();
 
@@ -765,7 +766,7 @@ MackieControlProtocol::master_fader_touch_release (Mackie::Button &)
 {
 	DEBUG_TRACE (DEBUG::MackieControl, "MackieControlProtocol::master_fader_touch_release\n");
 
-	Fader* master_fader = surfaces.front()->master_fader();
+	Fader* master_fader = _master_surface->master_fader();
 
 	master_fader->set_in_use (false);
 	master_fader->stop_touch (transport_frame(), true);