diff --git a/src/edgeMesh/featureEdgeMesh/featureEdgeMesh.C b/src/edgeMesh/featureEdgeMesh/featureEdgeMesh.C
index 85e32d9968..adcb3b2141 100644
--- a/src/edgeMesh/featureEdgeMesh/featureEdgeMesh.C
+++ b/src/edgeMesh/featureEdgeMesh/featureEdgeMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -120,10 +120,16 @@ Foam::featureEdgeMesh::edgeStatus Foam::featureEdgeMesh::classifyEdge
         const vector n0(norms[edNorms[0]]);
         const vector n1(norms[edNorms[1]]);
 
-        if ((n0 & n1) > cosNormalAngleTol_)
+        scalar n0n1 = n0 & n1;
+
+        if (n0n1 > cosNormalAngleTol_)
         {
             return FLAT;
         }
+        else if (n0n1 < -cosNormalAngleTol_)
+        {
+            return OPEN;
+        }
         else if ((fC0tofC1 & n0) > 0.0)
         {
             return INTERNAL;
diff --git a/src/edgeMesh/featureEdgeMesh/featureEdgeMesh.H b/src/edgeMesh/featureEdgeMesh/featureEdgeMesh.H
index cafa5e3074..aba24907b4 100644
--- a/src/edgeMesh/featureEdgeMesh/featureEdgeMesh.H
+++ b/src/edgeMesh/featureEdgeMesh/featureEdgeMesh.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/edgeMesh/featureEdgeMesh/featureEdgeMeshI.H b/src/edgeMesh/featureEdgeMesh/featureEdgeMeshI.H
index 6aac568b03..cb138bf251 100644
--- a/src/edgeMesh/featureEdgeMesh/featureEdgeMeshI.H
+++ b/src/edgeMesh/featureEdgeMesh/featureEdgeMeshI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C b/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C
index 55574d54b6..23dd5dadee 100644
--- a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C
+++ b/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C
@@ -185,8 +185,6 @@ void Foam::conformalVoronoiMesh::buildSurfaceConformation
             << "    Number of edge hits " << featureEdgeHits.size()
             << endl;
 
-        timeCheck("After initial conformation");
-
         insertSurfacePointPairs
         (
             surfaceHits,
@@ -201,6 +199,8 @@ void Foam::conformalVoronoiMesh::buildSurfaceConformation
             "edgeConformationLocations_initial.obj"
         );
 
+        timeCheck("After initial conformation");
+
         initialTotalHits = surfaceHits.size() + featureEdgeHits.size();
     }
 
@@ -321,8 +321,6 @@ void Foam::conformalVoronoiMesh::buildSurfaceConformation
             << "    Number of edge hits " << featureEdgeHits.size()
             << endl;
 
-        timeCheck("Conformation iteration " + name(iterationNo));
-
         totalHits = surfaceHits.size() + featureEdgeHits.size();
 
         if (totalHits > 0)
@@ -345,6 +343,8 @@ void Foam::conformalVoronoiMesh::buildSurfaceConformation
             );
         }
 
+        timeCheck("Conformation iteration " + name(iterationNo));
+
         iterationNo++;
 
         if (iterationNo == maxIterations)