diff --git a/CHANGELOG.md b/CHANGELOG.md
index 28db4637..3d62f685 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@ CHANGELOG for FlatCAM beta
 - fixed error that did not allowed printing from the TextEditor
 - added an error message when the File -> Print to PDF functionality is not working due of missing a root element in the SVG step
 - fixed printing a CNCJob object with File -> Print(PDF) functionality by adding a root element if both travels and cuts are present
+- fixed some more Shapely 2.0 deprecation warnings
 
 27.10.2021
 
diff --git a/camlib.py b/camlib.py
index 1195284e..7e2668f9 100644
--- a/camlib.py
+++ b/camlib.py
@@ -1831,7 +1831,8 @@ class Geometry(object):
 
         # Add lines to storage
         try:
-            for line in lines_trimmed:
+            lines_t_geo = lines_trimmed.geoms if isinstance(lines_trimmed, MultiLineString) else lines_trimmed
+            for line in lines_t_geo:
                 if isinstance(line, LineString) or isinstance(line, LinearRing):
                     if not line.is_empty:
                         geoms.insert(line)
@@ -1845,7 +1846,8 @@ class Geometry(object):
         # Add margin (contour) to storage
         if contour:
             try:
-                for poly in margin_poly:
+                margin_poly_geo = margin_poly.geoms if isinstance(margin_poly, MultiPolygon) else margin_poly
+                for poly in margin_poly_geo:
                     if isinstance(poly, Polygon) and not poly.is_empty:
                         geoms.insert(poly.exterior)
                         if prog_plot: