diff --git a/CHANGELOG.md b/CHANGELOG.md
index fa899dec..f7c56a15 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@ CHANGELOG for FlatCAM beta
 - fixed the marking of apertures in Gerber object UI and in Extract plugin
 - minor changes in `cncjob` Tcl command
 - updated the `offset` and `scale` Tcl commands to work on a selection of objects
+- minor changed in camlib.py regarding the self.check_zcut() method setting the self.z_cut to 'fail'
 
 31.02.2022
 
diff --git a/camlib.py b/camlib.py
index 60737853..d8871e42 100644
--- a/camlib.py
+++ b/camlib.py
@@ -3230,6 +3230,7 @@ class CNCjob(Geometry):
             return -zcut
         elif zcut == 0:
             self.app.inform.emit('[WARNING] %s.' % _("The Cut Z parameter is zero. There will be no cut, aborting"))
+
             return 'fail'
         else:
             return zcut
@@ -3304,8 +3305,10 @@ class CNCjob(Geometry):
         p = self.pp_excellon
 
         # Z_cut parameter
+        o_z_cut = deepcopy(self.z_cut)
         self.z_cut = self.check_zcut(zcut=tool_dict["tools_drill_cutz"])
         if self.z_cut == 'fail':
+            self.z_cut = o_z_cut
             return 'fail'
 
         # Depth parameters
@@ -4074,8 +4077,10 @@ class CNCjob(Geometry):
         self.use_ui = True if use_ui else False
 
         # Z_cut parameter
+        o_z_cut = deepcopy(self.z_cut)
         self.z_cut = self.check_zcut(zcut=self.z_cut)
         if self.z_cut == 'fail':
+            self.z_cut = o_z_cut
             return 'fail'
 
         # XY_toolchange parameter