diff --git a/src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol.cxx b/src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol.cxx
index fdb95577c4..37afafea53 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol.cxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol.cxx
@@ -89,7 +89,7 @@ void RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol::ReadStep
   Handle(StepDimTol_HArray1OfGeometricToleranceModifier) aModifiers;
   Standard_Integer sub = 0;
   if ( data->ReadSubList (num, 1, "modifiers", ach, sub) ) {
-    Standard_Integer nb0 = data->NbParams(sub5);
+    Standard_Integer nb0 = data->NbParams(sub);
     aModifiers = new StepDimTol_HArray1OfGeometricToleranceModifier (1, nb0);
     Standard_Integer num2 = sub;
     for ( Standard_Integer i0=1; i0 <= nb0; i0++ ) {
diff --git a/src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndGeoTolWthMod.cxx b/src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndGeoTolWthMod.cxx
index 82fd6d2c82..4bb6bf7c07 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndGeoTolWthMod.cxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndGeoTolWthMod.cxx
@@ -84,7 +84,7 @@ void RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndGeoTolWthMod::ReadStep
   Handle(StepDimTol_HArray1OfGeometricToleranceModifier) aModifiers;
   Standard_Integer sub = 0;
   if ( data->ReadSubList (num, 1, "modifiers", ach, sub) ) {
-    Standard_Integer nb0 = data->NbParams(sub5);
+    Standard_Integer nb0 = data->NbParams(sub);
     aModifiers = new StepDimTol_HArray1OfGeometricToleranceModifier (1, nb0);
     Standard_Integer num2 = sub;
     for ( Standard_Integer i0=1; i0 <= nb0; i0++ ) {
diff --git a/src/STEPCAFControl/STEPCAFControl_Writer.cxx b/src/STEPCAFControl/STEPCAFControl_Writer.cxx
index 78bae8f894..0b7b60893d 100644
--- a/src/STEPCAFControl/STEPCAFControl_Writer.cxx
+++ b/src/STEPCAFControl/STEPCAFControl_Writer.cxx
@@ -3237,7 +3237,7 @@ static void WriteGeomTolerance (const Handle(XSControl_WorkSession) &WS,
   Standard_Integer aModifNb = aModifiers.Length();
   if (anObject->GetMaterialRequirementModifier() != XCAFDimTolObjects_GeomToleranceMatReqModif_None)
       aModifNb++;
-  for (Standard_Integer i = 1; i < aModifiers.Length(); i++)
+  for (Standard_Integer i = 1; i <= aModifiers.Length(); i++)
     if (aModifiers.Value(i) == XCAFDimTolObjects_GeomToleranceModif_All_Around ||
         aModifiers.Value(i) == XCAFDimTolObjects_GeomToleranceModif_All_Over)
         aModifNb--;
diff --git a/src/XDEDRAW/XDEDRAW_GDTs.cxx b/src/XDEDRAW/XDEDRAW_GDTs.cxx
index 210b909b45..3a2649866b 100644
--- a/src/XDEDRAW/XDEDRAW_GDTs.cxx
+++ b/src/XDEDRAW/XDEDRAW_GDTs.cxx
@@ -428,10 +428,20 @@ static Standard_Integer DumpNbDGTs (Draw_Interpretor& di, Standard_Integer argc,
       Handle(XCAFDimTolObjects_GeomToleranceObject) anObject = aGTAttr->GetObject();
       if (anObject.IsNull())
         continue;
-      if (anObject->GetModifiers().Length() > 0 ||
-          anObject->GetMaterialRequirementModifier() != XCAFDimTolObjects_GeomToleranceMatReqModif_None) {
+      if (anObject->GetMaterialRequirementModifier() != XCAFDimTolObjects_GeomToleranceMatReqModif_None) {
         nbWithModif++;
       }
+      else if (anObject->GetModifiers().Length() > 0) {
+        Standard_Boolean isHasModif = Standard_False;
+        for (Standard_Integer i = 1; i <= anObject->GetModifiers().Length(); i++)
+          if (anObject->GetModifiers().Value(i) != XCAFDimTolObjects_GeomToleranceModif_All_Around &&
+            anObject->GetModifiers().Value(i) != XCAFDimTolObjects_GeomToleranceModif_All_Over) {
+            isHasModif = Standard_True;
+            break;
+          }
+        if (isHasModif)
+          nbWithModif++;
+      }
       if (anObject->GetMaxValueModifier() != 0) {
         nbWithMaxTol++;
       }
diff --git a/tests/gdt/export/A1 b/tests/gdt/export/A1
index 0272ad9f5e..3824da2d4b 100644
--- a/tests/gdt/export/A1
+++ b/tests/gdt/export/A1
@@ -10,7 +10,7 @@ set ref_data {
   NbOfWithPath           : 0
   NbOfCommonLabels       : 0
  NbOfTolerances          : 6
-  NbOfGTWithModifiers    : 1
+  NbOfGTWithModifiers    : 0
   NbOfGTWithMaxTolerance : 0
   NbOfGTWithDatums       : 5
  NbOfDatumFeature        : 3
diff --git a/tests/gdt/export/B1 b/tests/gdt/export/B1
index cb35c448fd..700c151d4f 100644
--- a/tests/gdt/export/B1
+++ b/tests/gdt/export/B1
@@ -10,7 +10,7 @@ set ref_data {
   NbOfWithPath           : 0
   NbOfCommonLabels       : 0
  NbOfTolerances          : 33
-  NbOfGTWithModifiers    : 23
+  NbOfGTWithModifiers    : 17
   NbOfGTWithMaxTolerance : 0
   NbOfGTWithDatums       : 30
  NbOfDatumFeature        : 10
diff --git a/tests/gdt/export/B2 b/tests/gdt/export/B2
index db2745c6ec..970a8a4238 100644
--- a/tests/gdt/export/B2
+++ b/tests/gdt/export/B2
@@ -10,7 +10,7 @@ set ref_data {
   NbOfWithPath           : 0
   NbOfCommonLabels       : 0
  NbOfTolerances          : 33
-  NbOfGTWithModifiers    : 23
+  NbOfGTWithModifiers    : 17
   NbOfGTWithMaxTolerance : 0
   NbOfGTWithDatums       : 30
  NbOfDatumFeature        : 10
diff --git a/tests/gdt/export/B4 b/tests/gdt/export/B4
index 6276f3ed31..14f6697ca6 100644
--- a/tests/gdt/export/B4
+++ b/tests/gdt/export/B4
@@ -10,7 +10,7 @@ set ref_data {
   NbOfWithPath           : 0
   NbOfCommonLabels       : 0
  NbOfTolerances          : 31
-  NbOfGTWithModifiers    : 8
+  NbOfGTWithModifiers    : 6
   NbOfGTWithMaxTolerance : 0
   NbOfGTWithDatums       : 30
  NbOfDatumFeature        : 6
diff --git a/tests/gdt/export/B5 b/tests/gdt/export/B5
index 26e7e8eadb..b994fc8b5a 100644
--- a/tests/gdt/export/B5
+++ b/tests/gdt/export/B5
@@ -10,7 +10,7 @@ set ref_data {
   NbOfWithPath           : 0
   NbOfCommonLabels       : 0
  NbOfTolerances          : 31
-  NbOfGTWithModifiers    : 8
+  NbOfGTWithModifiers    : 6
   NbOfGTWithMaxTolerance : 0
   NbOfGTWithDatums       : 30
  NbOfDatumFeature        : 6