Index: tool_arrow.c
===================================================================
--- tool_arrow.c	(revision 29398)
+++ tool_arrow.c	(revision 29399)
@@ -71,7 +71,7 @@
 		pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_false);
 		hl->tool_click = pcb_false;
 		if (pcb_crosshair_note.Moving && !pcb_gui->shift_is_pressed(pcb_gui)) {
-			pcb_grabbed.status = pcb_true;
+			hl->tool_grabbed.status = pcb_true;
 			pcb_crosshair_note.Buffer = conf_core.editor.buffer_number;
 			pcb_buffer_set_number(PCB_MAX_BUFFER - 1);
 			pcb_buffer_clear(pcb, PCB_PASTEBUFFER);
@@ -85,7 +85,7 @@
 		else if (hl->tool_hit && !pcb_gui->shift_is_pressed(pcb_gui)) {
 			pcb_box_t box;
 
-			pcb_grabbed.status = pcb_true;
+			hl->tool_grabbed.status = pcb_true;
 			pcb_tool_save(hl);
 			pcb_tool_is_saved = pcb_true;
 			pcb_tool_select_by_name(hl, pcb_gui->control_is_pressed(pcb_gui)? "copy" : "move");
Index: tool_line.c
===================================================================
--- tool_line.c	(revision 29398)
+++ tool_line.c	(revision 29399)
@@ -218,9 +218,9 @@
 
 		if (conf_core.editor.orthogonal_moves) {
 			/* set the mark to the new starting point so ortho works as expected and we can draw a perpendicular line from here */
-			pcb_grabbed.X = pcb_crosshair.Route.end_point.X;
-			pcb_grabbed.Y = pcb_crosshair.Route.end_point.Y;
-			pcb_grabbed.status = pcb_true;
+			hl->tool_grabbed.X = pcb_crosshair.Route.end_point.X;
+			hl->tool_grabbed.Y = pcb_crosshair.Route.end_point.Y;
+			hl->tool_grabbed.status = pcb_true;
 		}
 
 		if (ps)
Index: tool_poly.c
===================================================================
--- tool_poly.c	(revision 29398)
+++ tool_poly.c	(revision 29399)
@@ -92,9 +92,9 @@
 
 	if (conf_core.editor.orthogonal_moves) {
 		/* set the mark to the new starting point so ortho works */
-		pcb_grabbed.X = hl->tool_x;
-		pcb_grabbed.Y = hl->tool_y;
-		pcb_grabbed.status = pcb_true;
+		hl->tool_grabbed.X = hl->tool_x;
+		hl->tool_grabbed.Y = hl->tool_y;
+		hl->tool_grabbed.status = pcb_true;
 	}
 }
 
Index: tool_polyhole.c
===================================================================
--- tool_polyhole.c	(revision 29398)
+++ tool_polyhole.c	(revision 29399)
@@ -94,9 +94,9 @@
 
 			if (conf_core.editor.orthogonal_moves) {
 				/* set the mark to the new starting point so ortho works */
-				pcb_grabbed.X = hl->tool_x;
-				pcb_grabbed.Y = hl->tool_y;
-				pcb_grabbed.status = pcb_true;
+				hl->tool_grabbed.X = hl->tool_x;
+				hl->tool_grabbed.Y = hl->tool_y;
+				hl->tool_grabbed.status = pcb_true;
 			}
 
 			/* check if this is the last point of a polygon */