diff --git a/OpenNest.Core/Geometry/Shape.cs b/OpenNest.Core/Geometry/Shape.cs
index cb03c34..843485d 100644
--- a/OpenNest.Core/Geometry/Shape.cs
+++ b/OpenNest.Core/Geometry/Shape.cs
@@ -459,10 +459,8 @@ namespace OpenNest.Geometry
                 lastEntity = entity;
             }
 
-            var cutoutSide = side == OffsetSide.Left ? OffsetSide.Right : OffsetSide.Left;
-
             foreach (var cutout in definedShape.Cutouts)
-                offsetShape.Entities.AddRange(((Shape)cutout.OffsetEntity(distance, cutoutSide)).Entities);
+                offsetShape.Entities.AddRange(((Shape)cutout.OffsetEntity(distance, side)).Entities);
 
             return offsetShape;
         }
diff --git a/OpenNest/Forms/CadConverterForm.cs b/OpenNest/Forms/CadConverterForm.cs
index 53797bb..6621504 100644
--- a/OpenNest/Forms/CadConverterForm.cs
+++ b/OpenNest/Forms/CadConverterForm.cs
@@ -34,7 +34,7 @@ namespace OpenNest.Forms
             {
                 var dir = shape.ToPolygon(3).RotationDirection();
 
-                if (dir != RotationType.CW)
+                if (dir != rotation)
                     shape.Reverse();
             }
             catch { }