diff --git a/src/math/math_GlobOptMin.cxx b/src/math/math_GlobOptMin.cxx
index 57dd45f08f..7261b6351d 100644
--- a/src/math/math_GlobOptMin.cxx
+++ b/src/math/math_GlobOptMin.cxx
@@ -407,11 +407,17 @@ void math_GlobOptMin::computeGlobalExtremum(Standard_Integer j)
   math_Vector aStepBestPoint(1, myN);
   Standard_Boolean isInside = Standard_False;
   Standard_Real r;
+  Standard_Boolean isReached = Standard_False;
 
-  for(myX(j) = myA(j) + myE1; myX(j) < myB(j) + myE1; myX(j) += myV(j))
+  for(myX(j) = myA(j) + myE1; 
+     (myX(j) < myB(j) + myE1) && (!isReached);
+      myX(j) += myV(j))
   {
     if (myX(j) > myB(j))
+    {
       myX(j) = myB(j);
+      isReached = Standard_True;
+    }
 
     if (j == 1)
     {
diff --git a/tests/bugs/modalg_6/bug26484 b/tests/bugs/modalg_6/bug26484
new file mode 100644
index 0000000000..c1a991f41e
--- /dev/null
+++ b/tests/bugs/modalg_6/bug26484
@@ -0,0 +1,20 @@
+puts "=========="
+puts "OCC26484"
+puts "=========="
+puts ""
+###########################################
+# BRepExtrema_DistShapeShape hangs
+###########################################
+
+restore [locate_data_file bug26484_shape.brep] s1
+restore [locate_data_file bug26484_face.brep] s2
+distmini dd s1 s2
+dump dd_val
+
+distmini dd s2 s1
+regexp {([-0-9.+eE]+)$} [dump dd_val] full dist
+
+set expected_dist 13.2039203316305
+set tol_abs_dist 1.0e-07
+set tol_rel_dist 0.01
+checkreal "Dump of dd_val" ${dist} ${expected_dist} ${tol_abs_dist} ${tol_rel_dist}