diff --git a/FlatCAMObj.py b/FlatCAMObj.py
index e19a0f9b..8b7126a0 100644
--- a/FlatCAMObj.py
+++ b/FlatCAMObj.py
@@ -648,6 +648,12 @@ class FlatCAMExcellon(FlatCAMObj, Excellon):
             dia.setFlags(QtCore.Qt.ItemIsEnabled)
             self.ui.tools_table.setItem(i, 1, dia)  # Diameter
             i += 1
+        
+        # sort the tool diameter column
+        self.ui.tools_table.sortItems(1)
+        # all the tools are selected by default
+        self.ui.tools_table.selectColumn(0)
+        
         self.ui.tools_table.resizeColumnsToContents()
         self.ui.tools_table.resizeRowsToContents()
         self.ui.tools_table.horizontalHeader().setStretchLastSection(True)
diff --git a/camlib.py b/camlib.py
index c4edaf47..7e77d3a9 100644
--- a/camlib.py
+++ b/camlib.py
@@ -2746,7 +2746,7 @@ class CNCjob(Geometry):
 
         gcode += self.pausecode + "\n"
 
-        for tool in points:
+        for tool in tools:
 
             # Tool change sequence (optional)
             if toolchange: