diff --git a/libs/surfaces/mackie/mackie_control_protocol.cc b/libs/surfaces/mackie/mackie_control_protocol.cc
index 74d1781aef..f5d7c9b8f0 100644
--- a/libs/surfaces/mackie/mackie_control_protocol.cc
+++ b/libs/surfaces/mackie/mackie_control_protocol.cc
@@ -298,7 +298,7 @@ MackieControlProtocol::switch_banks (int initial)
 
 			DEBUG_TRACE (DEBUG::MackieControl, string_compose ("remote id %1 connecting %2 to %3 with port %4\n", 
 									   route->remote_control_id(), route->name(), strip.name(), port_for_id(i)));
-			route_table[i] = route;
+			set_route_table (1, route);
 			RouteSignal * rs = new RouteSignal (route, *this, strip, port_for_id(i));
 			route_signals.push_back (rs);
 			// update strip from route
diff --git a/libs/surfaces/mackie/mackie_surface.cc b/libs/surfaces/mackie/mackie_surface.cc
index 81db894a80..b05f6be0ab 100644
--- a/libs/surfaces/mackie/mackie_surface.cc
+++ b/libs/surfaces/mackie/mackie_surface.cc
@@ -30,9 +30,6 @@ Mackie::MackieSurface::init_controls()
 	// intialise groups and strips
 	Group * group = 0;
 	
-	// make sure there are enough strips
-	strips.resize (8);
-	
 	group = new Group  ("user");
 	groups["user"] = group;
 	
diff --git a/libs/surfaces/mackie/surface.cc b/libs/surfaces/mackie/surface.cc
index 4f8d95b3e3..863c3ca643 100644
--- a/libs/surfaces/mackie/surface.cc
+++ b/libs/surfaces/mackie/surface.cc
@@ -18,8 +18,11 @@ Surface::Surface( uint32_t max_strips, uint32_t unit_strips )
 void Surface::init()
 {
 	DEBUG_TRACE (DEBUG::MackieControl, "Surface::init\n");
+
+	strips.resize (_max_strips);
 	init_controls ();
 	init_strips ();
+
 	DEBUG_TRACE (DEBUG::MackieControl, "Surface::init finish\n");
 }