diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4d3edbf0..608e437b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ CHANGELOG for FlatCAM beta
 
 - Geometry Editor can now modify the edited tool diameter
 - upgraded the Drilling Plugin and all the related parts in the CNCJob Object and in all preprocessors. Now, the parent 'tools' attribute is inherited and also the GCode is stored here
+- small fix in the Toolchange_Manual preprocessor
 
 13.03.2021
 
diff --git a/preprocessors/Toolchange_Manual.py b/preprocessors/Toolchange_Manual.py
index 13d08da7..c54714b3 100644
--- a/preprocessors/Toolchange_Manual.py
+++ b/preprocessors/Toolchange_Manual.py
@@ -20,7 +20,7 @@ class Toolchange_Manual(PreProc):
         coords_xy = p['xy_toolchange']
         end_coords_xy = p['xy_end']
         gcode = '(This preprocessor has a special sequence when doing a toolchange.)\n'
-        gcode += '(Compatible with MACH3,)\n\n'
+        gcode += '(Compatible with MACH3.)\n\n'
 
         xmin = '%.*f' % (p.coords_decimals, p['options']['xmin'])
         xmax = '%.*f' % (p.coords_decimals, p['options']['xmax'])
@@ -58,7 +58,7 @@ class Toolchange_Manual(PreProc):
                 gcode += '(Tool: %s -> ' % str(tool) + 'Z_Cut: %s' % str(val['data']["tools_drill_cutz"]) + ')\n'
 
             gcode += '\n(Tools Offset: )\n'
-            for tool, val in p['exc_cnc_tools'].items():
+            for tool, val in p['tools'].items():
                 gcode += '(Tool: %s -> ' % str(tool) + 'Offset Z: %s' % \
                          str(val['data']["tools_drill_offset"]) + ')\n'