diff --git a/src/Mod/Sketcher/App/SketchObject.cpp b/src/Mod/Sketcher/App/SketchObject.cpp
index d27557d78a..9ff799fe3d 100644
--- a/src/Mod/Sketcher/App/SketchObject.cpp
+++ b/src/Mod/Sketcher/App/SketchObject.cpp
@@ -8620,20 +8620,23 @@ bool SketchObject::evaluateConstraints() const
 
     std::vector<Part::Geometry*> geometry = getCompleteGeometry();
     const std::vector<Sketcher::Constraint*>& constraints = Constraints.getValuesForce();
-    if (static_cast<int>(geometry.size()) != extGeoCount + intGeoCount)
+    if (static_cast<int>(geometry.size()) != extGeoCount + intGeoCount) {
         return false;
-    if (geometry.size() < 2)
+    }
+    if (geometry.size() < 2) {
         return false;
+    }
 
-    std::vector<Sketcher::Constraint*>::const_iterator it;
-    for (it = constraints.begin(); it != constraints.end(); ++it) {
-        if (!evaluateConstraint(*it))
+    for (auto it : constraints) {
+        if (!evaluateConstraint(it)) {
             return false;
+        }
     }
 
     if (!constraints.empty()) {
-        if (!Constraints.scanGeometry(geometry))
+        if (!Constraints.scanGeometry(geometry)) {
             return false;
+        }
     }
 
     return true;
@@ -8652,8 +8655,9 @@ void SketchObject::validateConstraints()
     std::vector<Sketcher::Constraint*>::const_iterator it;
     for (it = constraints.begin(); it != constraints.end(); ++it) {
         bool valid = evaluateConstraint(*it);
-        if (valid)
+        if (valid) {
             newConstraints.push_back(*it);
+        }
     }
 
     if (newConstraints.size() != constraints.size()) {
diff --git a/src/Mod/Sketcher/SketcherTests/TestSketchValidateCoincidents.py b/src/Mod/Sketcher/SketcherTests/TestSketchValidateCoincidents.py
index a2c9e30b3e..682206a53d 100644
--- a/src/Mod/Sketcher/SketcherTests/TestSketchValidateCoincidents.py
+++ b/src/Mod/Sketcher/SketcherTests/TestSketchValidateCoincidents.py
@@ -80,6 +80,9 @@ class TestSketchValidateCoincidents(unittest.TestCase):
         self.assertEqual(sketch.removeDegeneratedGeometries(tol), 1)
         self.assertEqual(sketch.detectDegeneratedGeometries(tol), 0)
         self.assertEqual(sketch.ConstraintCount, 0)
+        del v0, v1, v2
+        del geo0, geo1
+        del sketch
 
     def testDeleteConstraintsToExternalCase(self):
         box = self.Doc.addObject("Part::Box", "Box")
@@ -97,6 +100,33 @@ class TestSketchValidateCoincidents(unittest.TestCase):
         sketch.delConstraintsToExternal()
         self.Doc.recompute()
         self.assertEqual(sketch.ConstraintCount, 1)
+        del v0, v1
+        del geo0
+        del sketch
+        del box
+
+    def testValidateConstraintsCase(self):
+        sketch = self.Doc.addObject("Sketcher::SketchObject", "Sketch")
+        v0 = Vector(-47.680691, 18.824165000000004, 0.0)
+        v1 = Vector(-47.680691, -27.346279, 0.0)
+        v2 = Vector(51.132679, -27.346279, 0.0)
+        geo0 = sketch.addGeometry(Part.LineSegment(v0, v1))
+        geo1 = sketch.addGeometry(Part.LineSegment(v1, v2))
+        sketch.addConstraint(Sketcher.Constraint("Coincident", geo0, 2, geo1, 1))
+
+        c = sketch.Constraints[0]
+        c.First = 2
+        sketch.Constraints = [c]
+        self.assertEqual(sketch.ConstraintCount, 1)
+        self.assertFalse(sketch.evaluateConstraints())
+
+        sketch.validateConstraints()
+
+        self.assertEqual(sketch.ConstraintCount, 0)
+        self.assertTrue(sketch.evaluateConstraints())
+        del v0, v1, v2
+        del geo0, geo1
+        del sketch, c
 
     def tearDown(self):
         # closing doc