diff --git a/Applications/DataExplorer/mainwindow.cpp b/Applications/DataExplorer/mainwindow.cpp
index 9a91b6be10a6cdcccf91394c67457e3c52ad5183..329b90cc730fda6c5f96ecc0c5ddc039425124ba 100644
--- a/Applications/DataExplorer/mainwindow.cpp
+++ b/Applications/DataExplorer/mainwindow.cpp
@@ -418,7 +418,7 @@ void MainWindow::save()
         FileIO::GMSH::GMSHInterface gmsh_io(
             _project.getGEOObjects(), true,
             FileIO::GMSH::MeshDensityAlgorithm::AdaptiveMeshDensity, 0.05,
-            0.5, 2, selected_geometries);
+            0.5, 2, selected_geometries, false, false);
         gmsh_io.setPrecision(std::numeric_limits<double>::digits10);
         bool const success = gmsh_io.writeToFile(fileName.toStdString());
 
@@ -901,14 +901,14 @@ void MainWindow::callGMSH(std::vector<std::string> & selectedGeometries,
                 FileIO::GMSH::GMSHInterface gmsh_io(
                     _project.getGEOObjects(), true,
                     FileIO::GMSH::MeshDensityAlgorithm::AdaptiveMeshDensity,
-                    param2, param3, param1, selectedGeometries);
+                    param2, param3, param1, selectedGeometries, false, false);
                 gmsh_io.setPrecision(std::numeric_limits<double>::digits10);
                 gmsh_io.writeToFile(fileName.toStdString());
             } else { // homogeneous meshing selected
                 FileIO::GMSH::GMSHInterface gmsh_io(
                     _project.getGEOObjects(), true,
                     FileIO::GMSH::MeshDensityAlgorithm::FixedMeshDensity,
-                    param4, param3, param1, selectedGeometries);
+                    param4, param3, param1, selectedGeometries, false, false);
                 gmsh_io.setPrecision(std::numeric_limits<double>::digits10);
                 gmsh_io.writeToFile(fileName.toStdString());
             }
diff --git a/Applications/FileIO/Gmsh/GMSHInterface.h b/Applications/FileIO/Gmsh/GMSHInterface.h
index ae356a1a87da2976bf51da13f89b1985364c48f6..5eecacd72b2ed8f0048591838c566129978b8a01 100644
--- a/Applications/FileIO/Gmsh/GMSHInterface.h
+++ b/Applications/FileIO/Gmsh/GMSHInterface.h
@@ -67,8 +67,8 @@ public:
                   bool include_stations_as_constraints,
                   GMSH::MeshDensityAlgorithm mesh_density_algorithm,
                   double param1, double param2, std::size_t param3,
-                  std::vector<std::string>& selected_geometries,
-                  bool rotate = false, bool keep_preprocessed_geometry = false);
+                  std::vector<std::string>& selected_geometries, bool rotate,
+                  bool keep_preprocessed_geometry);
 
     GMSHInterface(GMSHInterface const&) = delete;
     GMSHInterface(GMSHInterface &&) = delete;
diff --git a/GeoLib/Polygon.cpp b/GeoLib/Polygon.cpp
index 44449d4287855f32febda22a94c1045647193123..9c68f98b7bd2cadda1b9e5c3a9ea0a0322268cd7 100644
--- a/GeoLib/Polygon.cpp
+++ b/GeoLib/Polygon.cpp
@@ -57,7 +57,7 @@ Polygon::~Polygon()
 bool Polygon::initialise ()
 {
     if (this->isClosed()) {
-        ensureCWOrientation();
+        ensureCCWOrientation();
         return true;
     }
     WARN("Polygon::initialise(): base polyline is not closed.");
@@ -290,7 +290,7 @@ EdgeType Polygon::getEdgeType (std::size_t k, GeoLib::Point const & pnt) const
     }
 }
 
-void Polygon::ensureCWOrientation ()
+void Polygon::ensureCCWOrientation ()
 {
     // *** pre processing: rotate points to xy-plan
     // *** copy points to vector - last point is identical to the first
@@ -338,7 +338,7 @@ void Polygon::ensureCWOrientation ()
                     tmp_polygon_pnts[0]);
     }
 
-    if (orient == GeoLib::CCW)
+    if (orient != GeoLib::CCW)
     {
         // switch orientation
         std::size_t tmp_n_pnts (n_pnts);
diff --git a/GeoLib/Polygon.h b/GeoLib/Polygon.h
index ed6593176dc631eb8bbfb0ba53a2e71a8003f393..c4d160b95c39ec76a2167737d68835fb22e7fe71 100644
--- a/GeoLib/Polygon.h
+++ b/GeoLib/Polygon.h
@@ -130,7 +130,7 @@ private:
      */
     EdgeType getEdgeType (std::size_t k, GeoLib::Point const & pnt) const;
 
-    void ensureCWOrientation ();
+    void ensureCCWOrientation ();
 
 #if __GNUC__ <= 4 && (__GNUC_MINOR__ < 9)
     void splitPolygonAtIntersection(