diff --git a/src/BRepFill/BRepFill_OffsetWire.cxx b/src/BRepFill/BRepFill_OffsetWire.cxx
index 9a3890de3a..e644d9d9cc 100644
--- a/src/BRepFill/BRepFill_OffsetWire.cxx
+++ b/src/BRepFill/BRepFill_OffsetWire.cxx
@@ -1590,7 +1590,7 @@ void BRepFill_OffsetWire::FixHoles()
     Pf = BRep_Tool::Pnt(Vf);
     Pl = BRep_Tool::Pnt(Vl);
     Standard_Real DistF = RealLast(), DistL = RealLast();
-    Standard_Integer IndexF = 1, IndexL = 1;
+    Standard_Integer IndexF = 0, IndexL = 0;
     Standard_Boolean IsFirstF = Standard_False, IsFirstL = Standard_False;
     for (Standard_Integer i = 2; i <= UnclosedWires.Length(); i++)
     {
@@ -1641,6 +1641,10 @@ void BRepFill_OffsetWire::FixHoles()
         IsFirstL = Standard_False;
       }
     }
+    if (DistF > MaxTol)
+      IndexF = 0;
+    if (DistL > MaxTol)
+      IndexL = 0;
     TopoDS_Wire theWire;
     TopoDS_Edge theEdge;
     TopoDS_Vertex theVertex;
diff --git a/tests/bugs/modalg_6/bug26481 b/tests/bugs/modalg_6/bug26481
index 36b76c5e40..e9a321d5a0 100644
--- a/tests/bugs/modalg_6/bug26481
+++ b/tests/bugs/modalg_6/bug26481
@@ -8,7 +8,7 @@ puts ""
 
 smallview
 
-restore [locate_data_file OCC26481-linesarc.brep] a
+restore [locate_data_file bug26296_linesarc.brep] a
 fit
 openoffset r a 4 10.
 fit
diff --git a/tests/bugs/modalg_6/bug26540 b/tests/bugs/modalg_6/bug26540
new file mode 100644
index 0000000000..8f1925d41c
--- /dev/null
+++ b/tests/bugs/modalg_6/bug26540
@@ -0,0 +1,16 @@
+puts "============"
+puts "OCC26540"
+puts "============"
+puts ""
+##################################
+# Errors in BRepOffsetAPI_MakeOffset: infinite loop in method FixHoles for closed results.
+##################################
+
+smallview
+
+restore [locate_data_file bug26296_linesarc.brep] a
+fit
+mkoffset result a 10 30
+fit
+
+set only_screen_axo 1