diff --git a/io/visual/grape/ghmesh.cc b/io/visual/grape/ghmesh.cc
index 9b1e3699060c89e394f6b9c6416f3d2062dd07d2..734c975a89692753b200458684a188e804850ffb 100644
--- a/io/visual/grape/ghmesh.cc
+++ b/io/visual/grape/ghmesh.cc
@@ -1157,16 +1157,8 @@ int switchMethods(GENMESHnD *actHmesh)
       printf("Warning: Only data on leaf level, use LeafIterator! \n");
   }
 
-  if(leafButton->on_off == OFF)
-  {
-    /* the button is not pressed */
-    dune->first_macro = dune->fst_macro;
-    dune->next_macro  = dune->nxt_macro;
-    actHmesh->first_child = &first_child;
-    actHmesh->next_child = &next_child;
-    /*printf("Leaf is off \n");*/
-  }
-  else
+  // this marks the state before
+  if(leafButton->on_off == OFF) // off means it is going to be on
   {
     /* the button is pressed */
     dune->first_macro = dune->fst_leaf;
@@ -1176,6 +1168,15 @@ int switchMethods(GENMESHnD *actHmesh)
     isLeaf = 1;
     /*printf("Leaf is on \n");*/
   }
+  else
+  {
+    /* the button is not pressed */
+    dune->first_macro = dune->fst_macro;
+    dune->next_macro  = dune->nxt_macro;
+    actHmesh->first_child = &first_child;
+    actHmesh->next_child = &next_child;
+    /*printf("Leaf is off \n");*/
+  }
 
   return isLeaf;
 }