diff --git a/src/Mod/Sketcher/App/freegcs/GCS.cpp b/src/Mod/Sketcher/App/freegcs/GCS.cpp
index aa850c9a2..7b9455ddc 100644
--- a/src/Mod/Sketcher/App/freegcs/GCS.cpp
+++ b/src/Mod/Sketcher/App/freegcs/GCS.cpp
@@ -1397,7 +1397,9 @@ int System::diagnose()
                 Constraint *mostPopular = NULL;
                 for (std::map< Constraint *, SET_I >::const_iterator it=conflictingMap.begin();
                      it != conflictingMap.end(); it++) {
-                    if (it->second.size() >= maxPopularity) {
+                    if (it->second.size() > maxPopularity ||
+                        (it->second.size() == maxPopularity && mostPopular &&
+                         it->first->getTag() > mostPopular->getTag())) {
                         mostPopular = it->first;
                         maxPopularity = it->second.size();
                     }