diff --git a/PROMS/Volian.Controls.Library/DisplayRO.cs b/PROMS/Volian.Controls.Library/DisplayRO.cs
index 8f0f9996..6854b29d 100644
--- a/PROMS/Volian.Controls.Library/DisplayRO.cs
+++ b/PROMS/Volian.Controls.Library/DisplayRO.cs
@@ -332,7 +332,9 @@ namespace Volian.Controls.Library
 				string aplicValues = rntval.Substring(startCVIdx, EndCVidx + 6 - startCVIdx);
 				int endDefIdx = rntval.IndexOf(",", startCVIdx);
 				// C2022-001 - handle if there is no child value in the RO FSt
-				string defValue = rntval.Substring(startCVIdx + 16, ((endDefIdx > 0) ? endDefIdx : EndCVidx) - (startCVIdx + 16));
+				// B2022-051 - was sometimes leaving "/APL>" when processing return value maded up from  multiple RO (editor) fields
+				//             added check to make where next found comma was within the current <APL ... /APL>
+				string defValue = rntval.Substring(startCVIdx + 16, ((endDefIdx > 0 && endDefIdx < EndCVidx) ? endDefIdx : EndCVidx) - (startCVIdx + 16));
 				rntval = rntval.Replace(aplicValues, defValue);
 			}
 			return rntval;