diff --git a/Common/Options.cpp b/Common/Options.cpp
index 2f22ee4e805a1130ccb953cec9d919b79dd59389..0fb008815feb833909f45dd2c45b93a189f8acd6 100644
--- a/Common/Options.cpp
+++ b/Common/Options.cpp
@@ -3943,7 +3943,7 @@ double opt_geometry_occ_fix_degenerated(OPT_ARGS_NUM)
       (CTX::instance()->geom.occFixDegenerated);
   }
 #endif
-  return CTX::instance()->geom.occFixSmallEdges;
+  return CTX::instance()->geom.occFixDegenerated;
 }
 
 double opt_geometry_occ_fix_small_edges(OPT_ARGS_NUM)
@@ -5144,12 +5144,12 @@ double opt_mesh_hom_no_metric(OPT_ARGS_NUM)
 double opt_mesh_cgns_import_order(OPT_ARGS_NUM)
 {
   if(action & GMSH_SET) {
-    int value = (int)val; 
+    int value = (int)val;
     double order = val;
     while(order >= 2.0) {
       order = order / 2.0;
     }
-    
+
     if (order != 1.0)
       value = 1;
     CTX::instance()->mesh.cgnsImportOrder = value;
diff --git a/Fltk/optionWindow.cpp b/Fltk/optionWindow.cpp
index dec0c7e3fe7d18cb5377cb180735f712d4c650c2..486ce34d88d49144442bb79419db9f892d7e90be 100644
--- a/Fltk/optionWindow.cpp
+++ b/Fltk/optionWindow.cpp
@@ -385,11 +385,14 @@ static void geometry_options_ok_cb(Fl_Widget *w, void *data)
   opt_geometry_auto_coherence(0, GMSH_SET, o->geo.butt[8]->value());
   opt_geometry_light(0, GMSH_SET, o->geo.butt[9]->value());
   opt_geometry_highlight_orphans(0, GMSH_SET, o->geo.butt[10]->value());
+
   opt_geometry_occ_fix_degenerated(0, GMSH_SET, o->geo.butt[16]->value());
+  opt_geometry_occ_fix_small_edges(0, GMSH_SET, o->geo.butt[11]->value());
   opt_geometry_occ_fix_small_faces(0, GMSH_SET, o->geo.butt[12]->value());
   opt_geometry_occ_sew_faces(0, GMSH_SET, o->geo.butt[13]->value());
-  opt_geometry_light_two_side(0, GMSH_SET, o->geo.butt[14]->value());
   opt_geometry_occ_connect_faces(0, GMSH_SET, o->geo.butt[15]->value());
+
+  opt_geometry_light_two_side(0, GMSH_SET, o->geo.butt[14]->value());
   int old_hide_compound = (int)opt_geometry_hide_compounds(0, GMSH_GET, 0);
   opt_geometry_hide_compounds(0, GMSH_SET, o->geo.butt[17]->value());