diff --git a/CHANGELOG.md b/CHANGELOG.md
index 09a749a4..b7de50c4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,7 @@ CHANGELOG for FlatCAM beta
 - Punch Gerber Tool - made sure that Select All/Deselect All in Manual mode is actually selecting pads not only visually
 - Punch Gerber Tool - finished manual mode for "Excellon" method
 - Punch Gerber Tool - finished manual mode for all methods
+- Cutout Tool - fixed generation of rectangular geometry if the selected gaps is "None"
 
 20.11.2020
 
diff --git a/appTools/ToolCutOut.py b/appTools/ToolCutOut.py
index eba1d344..5abfe5f2 100644
--- a/appTools/ToolCutOut.py
+++ b/appTools/ToolCutOut.py
@@ -840,7 +840,11 @@ class CutOut(AppTool):
                     self.app.inform.emit('[ERROR_NOTCL] %s' % _("Failed."))
                     return "fail"
 
-                solid_geo = linemerge(solid_geo)
+                try:
+                    solid_geo = linemerge(solid_geo)
+                except Exception:
+                    # there ar enot lines but polygons
+                    pass
 
                 if has_mouse_bites is True:
                     gapsize -= dia / 2
@@ -1190,7 +1194,11 @@ class CutOut(AppTool):
                     app_obj.inform.emit('[ERROR_NOTCL] %s' % _("Failed."))
                     return "fail"
 
-                solid_geo = linemerge(solid_geo)
+                try:
+                    solid_geo = linemerge(solid_geo)
+                except Exception:
+                    # there are not lines but polygon
+                    pass
 
                 if has_mouse_bites is True:
                     gapsize -= dia / 2