diff --git a/CHANGELOG.md b/CHANGELOG.md
index 37312b54..c8a5681e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,10 @@ CHANGELOG for FlatCAM beta
 
 =================================================
 
+20.09.2020
+
+- in CNCJob UI Autolevelling: on manual add of probe points, only voronoi diagram is calculated
+
 19.09.2020
 
 - removed some brackets in the GRBL laser preprocessor due of GRBL firmware interpreting the first closing bracket as the comment end
diff --git a/appObjects/FlatCAMCNCJob.py b/appObjects/FlatCAMCNCJob.py
index 67606fec..9ccda29d 100644
--- a/appObjects/FlatCAMCNCJob.py
+++ b/appObjects/FlatCAMCNCJob.py
@@ -1020,12 +1020,14 @@ class CNCJobObject(FlatCAMObj, CNCjob):
 
             self.app.inform.emit(_("Finished adding Probe Points..."))
 
-            pts_list = []
-            for k in self.al_voronoi_geo_storage:
-                pts_list.append(self.al_voronoi_geo_storage[k]['point'])
-            self.generate_voronoi_geometry(pts=pts_list)
+            al_method = self.ui.al_method_radio.get_value()
+            if al_method == 'v':
+                pts_list = []
+                for k in self.al_voronoi_geo_storage:
+                    pts_list.append(self.al_voronoi_geo_storage[k]['point'])
+                self.generate_voronoi_geometry(pts=pts_list)
 
-            self.probing_gcode_text = self.probing_gcode()
+                self.probing_gcode_text = self.probing_gcode(self.al_voronoi_geo_storage)
 
             # rebuild the al table
             self.build_al_table_sig.emit()