diff --git a/src/BRepFill/BRepFill_PipeShell.cxx b/src/BRepFill/BRepFill_PipeShell.cxx
index e08bb5aaa9..c1ee6b917f 100644
--- a/src/BRepFill/BRepFill_PipeShell.cxx
+++ b/src/BRepFill/BRepFill_PipeShell.cxx
@@ -227,7 +227,7 @@ BRepFill_PipeShell::BRepFill_PipeShell(const TopoDS_Wire& Spine)
   SetTolerance();
 
   myMaxDegree = 11;
-  myMaxSegments = 30;
+  myMaxSegments = 100;
 
   // Attention to closed non-declared wire !
   if (!mySpine.Closed()) {
diff --git a/tests/bugs/modalg_5/bug25883 b/tests/bugs/modalg_5/bug25883
new file mode 100644
index 0000000000..1d25852119
--- /dev/null
+++ b/tests/bugs/modalg_5/bug25883
@@ -0,0 +1,27 @@
+puts "========"
+puts "OCC25883"
+puts "========"
+puts ""
+#######################################################
+# BRepOffsetAPI_MakePipeShell produces invalid result
+#######################################################
+
+restore [locate_data_file OCC25883_shape.brep] a
+
+smallview
+
+explode a
+
+mksweep a_1
+addsweep a_2
+buildsweep res
+
+donly res
+fit
+
+set bug_info [checkshape res]
+if {[string compare $bug_info "This shape seems to be valid"] != 0} {
+  puts "ERROR: OCC25883 is reproduced."
+}
+
+set only_screen_axo 1