diff --git a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
index 9080f58e670beb940e62e2c83a49fb9f20de3e18..2372b144ec9af2d0a7e5920b3e22f9ff8281e407 100644
--- a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
+++ b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
@@ -47,8 +47,6 @@ Description
 #include "snapParameters.H"
 #include "layerParameters.H"
 
-#include "faceSet.H"
-#include "motionSmoother.H"
 
 using namespace Foam;
 
@@ -430,7 +428,7 @@ int main(int argc, char *argv[])
         // Refinement parameters
         refinementParameters refineParams(refineDict);
 
-        if (!overwrite)
+        if (!overwrite && !debug)
         {
             const_cast<Time&>(mesh.time())++;
         }
@@ -467,7 +465,7 @@ int main(int argc, char *argv[])
             curvature = refineParams.curvature();
         }
 
-        if (!overwrite)
+        if (!overwrite && !debug)
         {
             const_cast<Time&>(mesh.time())++;
         }
@@ -507,7 +505,7 @@ int main(int argc, char *argv[])
         }
 
 
-        if (!overwrite)
+        if (!overwrite &&  !debug)
         {
             const_cast<Time&>(mesh.time())++;
         }
diff --git a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict
index db67ba8a9348b42234115ad3f4bc99af8bb6d6ff..05dcb07286c462198652d72983057bb6122eecdb 100644
--- a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict
+++ b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict
@@ -233,9 +233,17 @@ snapControls
     //  before upon reaching a correct mesh.
     nRelaxIter 5;
 
-    //- Highly experimental and wip: number of feature edge snapping
-    //  iterations. Leave out altogether to disable.
-    //nFeatureSnapIter 20;
+    // Feature snapping
+
+        //- Number of feature edge snapping iterations.
+        //  Leave out altogether to disable.
+        nFeatureSnapIter 10;
+
+        //- Detect (geometric) features by sampling the surface (default=false)
+        implicitFeatureSnap false;
+
+        //- Use castellatedMeshControls::features (default = true)
+        explicitFeatureSnap true;
 }
 
 // Settings for the layer addition.