diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/checkData.H b/applications/utilities/postProcessing/dataConversion/foamToEnsight/checkData.H
index 73a0e17417..f33a8f727f 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/checkData.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/checkData.H
@@ -11,9 +11,8 @@ if (!fieldsToUse.found(fieldName))
     {
         variableGood =
         (
-            fieldName.size() > 2 && fieldName(fieldName.size()-2, 2) == "_0"
-          ? false
-          : IOobject
+            !fieldName.endsWith("_0")
+         && IOobject
             (
                 fieldName,
                 timeDirs[n1].name(),
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/findFields.H b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/findFields.H
index 721ba05101..0c841369cf 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/findFields.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/findFields.H
@@ -19,13 +19,9 @@ if (timeDirs.size())
         const word& fieldName = obj.name();
         const word& fieldType = obj.headerClassName();
 
-        if (fieldName.size() > 2 && fieldName(fieldName.size()-2, 2) == "_0")
+        if (volFieldTypes.found(fieldType) && !fieldName.endsWith("_0"))
         {
-            // ignore _0 fields
-        }
-        else if (volFieldTypes.found(fieldType))
-        {
-            // simply ignore types that we don't handle
+            // ignore types that we don't handle, and ignore _0 fields
             volumeFields.insert(fieldName, fieldType);
         }
     }
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C
index 8f84b90986..e7d6ea9140 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C
@@ -766,10 +766,7 @@ void Foam::GeometricField<Type, PatchField, GeoMesh>::storeOldTimes() const
     (
         field0Ptr_
      && timeIndex_ != this->time().timeIndex()
-     && !(
-            this->name().size() > 2
-         && this->name()(this->name().size()-2, 2) == "_0"
-         )
+     && !this->name().endsWith("_0")
     )
     {
         storeOldTime();