diff --git a/AppObjects/FlatCAMGerber.py b/AppObjects/FlatCAMGerber.py
index 91446571..b2a56112 100644
--- a/AppObjects/FlatCAMGerber.py
+++ b/AppObjects/FlatCAMGerber.py
@@ -796,7 +796,7 @@ class GerberObject(FlatCAMObj, Gerber):
 
         def follow_init(follow_obj, app):
             # Propagate options
-            follow_obj.options["cnctooldia"] = str(self.options["isotooldia"])
+            follow_obj.options["cnctooldia"] = str(self.app.defaults["tools_iso_tooldia"])
             follow_obj.solid_geometry = self.follow_geometry
 
         # TODO: Do something if this is None. Offer changing name?
diff --git a/AppTools/ToolEtchCompensation.py b/AppTools/ToolEtchCompensation.py
index 6f879f20..ac49a539 100644
--- a/AppTools/ToolEtchCompensation.py
+++ b/AppTools/ToolEtchCompensation.py
@@ -177,7 +177,7 @@ class ToolEtchCompensation(AppTool):
         )
         self.etchants_combo = FCComboBox(callback=self.confirmation_message)
         self.etchants_combo.setObjectName(_("Etchants"))
-        self.etchants_combo.addItems(["CuCl2", "Fe3Cl"])
+        self.etchants_combo.addItems(["CuCl2", "Fe3Cl", _("Alkaline baths")])
 
         grid0.addWidget(self.etchants_label, 18, 0)
         grid0.addWidget(self.etchants_combo, 18, 1)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index cc8f6203..98eaa8d6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,8 @@ CHANGELOG for FlatCAM beta
 
 - Tcl Shell - added a button to delete the content of the active line
 - Tcl Command Isolate - fixed to work in the new configuration
+- Tcl Command Follow - fixed to work in the new configuration
+- Etch Compensation Tool - added a new etchant: alkaline baths
 
 1.06.2020