diff --git a/src/Mod/Inspection/App/InspectionFeature.cpp b/src/Mod/Inspection/App/InspectionFeature.cpp
index 36efecf560..05ed5b46dc 100644
--- a/src/Mod/Inspection/App/InspectionFeature.cpp
+++ b/src/Mod/Inspection/App/InspectionFeature.cpp
@@ -113,18 +113,23 @@ InspectActualShape::InspectActualShape(const Part::TopoShape& shape) : _rShape(s
     Base::BoundBox3d bbox = _rShape.getBoundBox();
     Standard_Real deflection = (bbox.LengthX() + bbox.LengthY() + bbox.LengthZ())/300.0 * deviation;
 
+    fetchPoints(deflection);
+}
+
+void InspectActualShape::fetchPoints(double deflection)
+{
     // get points from faces or sub-sampled edges
     TopTools_IndexedMapOfShape mapOfShapes;
     TopExp::MapShapes(_rShape.getShape(), TopAbs_FACE, mapOfShapes);
     if (!mapOfShapes.IsEmpty()) {
         std::vector<Data::ComplexGeoData::Facet> f;
-        _rShape.getFaces(points, f, (float)deflection);
+        _rShape.getFaces(points, f, static_cast<float>(deflection));
     }
     else {
         TopExp::MapShapes(_rShape.getShape(), TopAbs_EDGE, mapOfShapes);
         if (!mapOfShapes.IsEmpty()) {
             std::vector<Base::Vector3d> n;
-            _rShape.getPoints(points, n, (float)deflection);
+            _rShape.getPoints(points, n, static_cast<float>(deflection));
         }
     }
 }
@@ -487,39 +492,51 @@ float InspectNominalShape::getDistance(const Base::Vector3f& point) const
         fMinDist = (float)distss->Value();
         // the shape is a solid, check if the vertex is inside
         if (isSolid) {
-            const Standard_Real tol = 0.001;
-            BRepClass3d_SolidClassifier classifier(_rShape);
-            classifier.Perform(pnt3d, tol);
-            if (classifier.State() == TopAbs_IN) {
+            if (isInsideSolid(pnt3d))
                 fMinDist = -fMinDist;
-            }
-
         }
         else if (fMinDist > 0) {
             // check if the distance was computed from a face
-            for (Standard_Integer index = 1; index <= distss->NbSolution(); index++) {
-                if (distss->SupportTypeShape1(index) == BRepExtrema_IsInFace) {
-                    TopoDS_Shape face = distss->SupportOnShape1(index);
-                    Standard_Real u, v;
-                    distss->ParOnFaceS1(index, u, v);
-                    //gp_Pnt pnt = distss->PointOnShape1(index);
-                    BRepGProp_Face props(TopoDS::Face(face));
-                    gp_Vec normal;
-                    gp_Pnt center;
-                    props.Normal(u, v, center, normal);
-                    gp_Vec dir(center, pnt3d);
-                    Standard_Real scalar = normal.Dot(dir);
-                    if (scalar < 0) {
-                        fMinDist = -fMinDist;
-                    }
-                    break;
-                }
-            }
+            if (isBelowFace(pnt3d))
+                fMinDist = -fMinDist;
         }
     }
     return fMinDist;
 }
 
+bool InspectNominalShape::isInsideSolid(const gp_Pnt& pnt3d) const
+{
+    const Standard_Real tol = 0.001;
+    BRepClass3d_SolidClassifier classifier(_rShape);
+    classifier.Perform(pnt3d, tol);
+    return (classifier.State() == TopAbs_IN);
+}
+
+bool InspectNominalShape::isBelowFace(const gp_Pnt& pnt3d) const
+{
+    // check if the distance was computed from a face
+    for (Standard_Integer index = 1; index <= distss->NbSolution(); index++) {
+        if (distss->SupportTypeShape1(index) == BRepExtrema_IsInFace) {
+            TopoDS_Shape face = distss->SupportOnShape1(index);
+            Standard_Real u, v;
+            distss->ParOnFaceS1(index, u, v);
+            //gp_Pnt pnt = distss->PointOnShape1(index);
+            BRepGProp_Face props(TopoDS::Face(face));
+            gp_Vec normal;
+            gp_Pnt center;
+            props.Normal(u, v, center, normal);
+            gp_Vec dir(center, pnt3d);
+            Standard_Real scalar = normal.Dot(dir);
+            if (scalar < 0) {
+                return true;
+            }
+            break;
+        }
+    }
+
+    return false;
+}
+
 // ----------------------------------------------------------------
 
 TYPESYSTEM_SOURCE(Inspection::PropertyDistanceList, App::PropertyLists)
diff --git a/src/Mod/Inspection/App/InspectionFeature.h b/src/Mod/Inspection/App/InspectionFeature.h
index 2efa5bdb68..81d9315c5d 100644
--- a/src/Mod/Inspection/App/InspectionFeature.h
+++ b/src/Mod/Inspection/App/InspectionFeature.h
@@ -32,6 +32,7 @@
 
 class TopoDS_Shape;
 class BRepExtrema_DistShapeShape;
+class gp_Pnt;
 
 namespace MeshCore {
 class MeshKernel;
@@ -88,6 +89,9 @@ public:
     unsigned long countPoints() const override;
     Base::Vector3f getPoint(unsigned long) const override;
 
+private:
+    void fetchPoints(double deflection);
+
 private:
     const Part::TopoShape& _rShape;
     std::vector<Base::Vector3d> points;
@@ -152,6 +156,10 @@ public:
     ~InspectNominalShape() override;
     float getDistance(const Base::Vector3f&) const override;
 
+private:
+    bool isInsideSolid(const gp_Pnt&) const;
+    bool isBelowFace(const gp_Pnt&) const;
+
 private:
     BRepExtrema_DistShapeShape* distss;
     const TopoDS_Shape& _rShape;