diff --git a/appTools/ToolDrilling.py b/appTools/ToolDrilling.py
index cf0ea27c..268ee2e1 100644
--- a/appTools/ToolDrilling.py
+++ b/appTools/ToolDrilling.py
@@ -1864,7 +1864,8 @@ class ToolDrilling(AppTool, Excellon):
             return
 
         # update the Excellon Tools
-        self.excellon_tools = obj.tools
+        # we don't do it here since it will break any changes we've done in the Drilling Tool UI
+        # self.excellon_tools = obj.tools
 
         xmin = obj.options['xmin']
         ymin = obj.options['ymin']
diff --git a/camlib.py b/camlib.py
index 9f733e37..2f791ac7 100644
--- a/camlib.py
+++ b/camlib.py
@@ -3144,6 +3144,8 @@ class CNCjob(Geometry):
             self.is_segmented_gcode = True
 
         self.exc_tools = deepcopy(tools)
+        self.tool = str(tool)
+
         t_gcode = ''
 
         # holds the temporary coordinates of the processed drill point
@@ -3179,7 +3181,6 @@ class CNCjob(Geometry):
         # ############# PARAMETERS used in PREPROCESSORS so they need to be updated ###############################
         # #########################################################################################################
         # #########################################################################################################
-        self.tool = str(tool)
         # Preprocessor
         p = self.pp_excellon