diff --git a/PROMS/Formats/fmtall/BASEall.xml b/PROMS/Formats/fmtall/BASEall.xml
index 927b0a15..364fb7ac 100644
Binary files a/PROMS/Formats/fmtall/BASEall.xml and b/PROMS/Formats/fmtall/BASEall.xml differ
diff --git a/PROMS/Formats/fmtall/RGEall.xml b/PROMS/Formats/fmtall/RGEall.xml
index 0a5d7250..b33aa15d 100644
Binary files a/PROMS/Formats/fmtall/RGEall.xml and b/PROMS/Formats/fmtall/RGEall.xml differ
diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs
index b6f02379..f153243f 100644
--- a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs
@@ -5553,7 +5553,10 @@ namespace VEPROMS.CSLA.Library
 				// Before checking for anything, if the DisplayNumber starts with 'ATTACHMENT ', don't use that in the Section
 				// prefix for the tabstring.
 				// F2023-112 - added flag to use entire section number in the step tab - Vogtle 3&4 Background format (VEGPBckStp)
-				string attNum =  (ActiveSection.DisplayNumber.ToUpper().StartsWith("ATTACHMENT ") && !FormatStepData.TabData.UseEntireSectionNum) ? ActiveSection.DisplayNumber.Substring(11) : ActiveSection.DisplayNumber;
+				// F2026-021 - made the parsing of the section number generic instead of only parsing if the section number properties
+				//             value started with the word "Attachment ".  We now look for the first space to determine the section number/letter
+				int	numidx = ActiveSection.DisplayNumber.IndexOf(" ");
+				string attNum = (numidx > -1 && (ActiveSection.DisplayNumber.Length > numidx + 1) && !FormatStepData.TabData.UseEntireSectionNum) ? ActiveSection.DisplayNumber.Substring(numidx + 1) : ActiveSection.DisplayNumber;
 				Match m = Regex.Match(attNum, @"[a-zA-Z]");  // for alpha, use non-touched displaynumber
 				int indx = -1;
 				if (m.Success)