diff --git a/PROMS/VEPROMS.CSLA.Library/Config/ROFSTLookup.cs b/PROMS/VEPROMS.CSLA.Library/Config/ROFSTLookup.cs
index 05312cb6..ebeadcb3 100644
--- a/PROMS/VEPROMS.CSLA.Library/Config/ROFSTLookup.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Config/ROFSTLookup.cs
@@ -324,7 +324,8 @@ namespace VEPROMS.CSLA.Library
 				{
 					idx = aplString.IndexOf("Value=", idx) + 6;
 					int idxEndVal = aplString.IndexOf(",UnitIdx=", idx); // look for more than just a comma incase value contains a comma
-					if (idxEndVal == -1) idxEndVal = EndCVidx; // if last child value is up to " /APL>"
+					if (idxEndVal == -1)// if last child value is up to " /APL>"
+						idxEndVal = aplString.IndexOf(" /APL>", idx); // B2021-141 get end of Parent/Child RO Values for this RO reference
 					if (idxEndVal > idx)
 						ChldValue = aplString.Substring(idx, idxEndVal - idx); // selected Child RO value
 					else