diff --git a/Fltk/onelabWindow.cpp b/Fltk/onelabWindow.cpp
index d02494c7a00a0ee34206cf83a82e7cf72b16f6b2..f607df36f419c4b92fe56055a2cb8a83d5f46a84 100644
--- a/Fltk/onelabWindow.cpp
+++ b/Fltk/onelabWindow.cpp
@@ -1256,7 +1256,8 @@ void solver_cb(Fl_Widget *w, void *data)
   else
     FlGui::instance()->onelab->rebuildSolverList();
 
-  onelab_cb(0, (void*)"check");
+  if(FlGui::instance()->onelab->getButtonMode() == "Compute")
+    onelab_cb(0, (void*)"check");
 }
 
 #else
diff --git a/Fltk/onelabWindow.h b/Fltk/onelabWindow.h
index 2c6bbadb2cc8127d11ea09e332084ac2038317b7..52f7188ce75e041687eac40bca8e2d5b7b15ccd7 100644
--- a/Fltk/onelabWindow.h
+++ b/Fltk/onelabWindow.h
@@ -39,6 +39,7 @@ class onelabWindow{
   void rebuildSolverList();
   void rebuildTree();
   void setButtonMode(const std::string &butt0, const std::string &butt1);
+  std::string getButtonMode(){ return _butt[1]->label(); }
   void show(){ _win->show(); }
   int shown(){ return _win->shown(); }
   int meshAuto(){ return _gear->menu()[2].value(); }
diff --git a/Mesh/meshGFace.cpp b/Mesh/meshGFace.cpp
index 6b7d64a66d0b958973705c9b48fc9abca6b5a7f7..22f503a820749f56a2372258eb82ed0cc556d637 100644
--- a/Mesh/meshGFace.cpp
+++ b/Mesh/meshGFace.cpp
@@ -1103,7 +1103,7 @@ bool meshGenerator(GFace *gf, int RECUR_ITER,
 
   // BOUNDARY LAYER
   if (!onlyInitialMesh) {
-    if (gf->getMeshingAlgo() == ALGO_2D_FRONTAL_QUAD) buildBackGroundMesh (gf);    
+    if (gf->getMeshingAlgo() == ALGO_2D_FRONTAL_QUAD) buildBackGroundMesh (gf);
     modifyInitialMeshForTakingIntoAccountBoundaryLayers(gf);
   }
 
@@ -1749,11 +1749,11 @@ void deMeshGFace::operator() (GFace *gf)
 }
 
 // for debugging, change value from -1 to -100;
-int debugSurface = -100; //-1;
+int debugSurface = -1; //-1;
 
 void meshGFace::operator() (GFace *gf)
 {
-  
+
   gf->model()->setCurrentMeshEntity(gf);
 
   if(debugSurface >= 0 && gf->tag() != debugSurface){