diff --git a/PROMS/ReferencedObjects/LibSource/RODBInterface/RODBInterface.cs b/PROMS/ReferencedObjects/LibSource/RODBInterface/RODBInterface.cs
index 0317c0b2..4675bb98 100644
--- a/PROMS/ReferencedObjects/LibSource/RODBInterface/RODBInterface.cs
+++ b/PROMS/ReferencedObjects/LibSource/RODBInterface/RODBInterface.cs
@@ -1796,6 +1796,7 @@ namespace RODBInterface
 				MyRecID = RecID;
 				string AccPageID = DBE.GetString(2);
 				string Info = DBE.GetString(3);
+				Info = Info.Replace("&apos", "\'");		// B2021-071: crash when getting/saving field names
 				node.SetAttribute("HasChild", "True");
 
 				// Store data in the VlnXmlElement as a subgroup
@@ -2458,6 +2459,7 @@ namespace RODBInterface
 										info = null;
 									DBE.ReaderClose();
 									DBE.CommandDispose();
+									if (info != null) info = info.Replace("\'", "&apos");   // B2021-071: crash when getting/saving field names
 									if (combofield == false)
 									{
 										tinfo1 = info.Replace(onameOpen, nnameOpen);
@@ -2598,8 +2600,9 @@ namespace RODBInterface
 								// Update subelements too.
 								if (success == true)
 									success = RODB_UpdateFieldNames(topgroup, recid, oldname, newname, editlevel, false, StatMsgWindow, combofield);
-								topgroup = (VlnXmlElement)topgroup.NextSibling;
+								//topgroup = (VlnXmlElement)topgroup.NextSibling;
 							}
+							topgroup = (VlnXmlElement)topgroup.NextSibling;		// B2021-071: infinite loop (moved this from above loop
 						}
 						StatMsgWindow.Dispose();
 					}