diff --git a/PROMS/ReferencedObjects/Exe/RefObj/ROEditor/ROEditor.cs b/PROMS/ReferencedObjects/Exe/RefObj/ROEditor/ROEditor.cs
index 43361914..5421addc 100644
--- a/PROMS/ReferencedObjects/Exe/RefObj/ROEditor/ROEditor.cs
+++ b/PROMS/ReferencedObjects/Exe/RefObj/ROEditor/ROEditor.cs
@@ -902,9 +902,12 @@ namespace ROEditor
 					return;
 				}
 			}
-			else
+			else  
 			{
-				myschema = myrodb.RODB_GetGroupSchema(curelem);
+				// B2017-015: if editing a group/subgroup, use the parent's schema to get the fields to edit for the menuing.   
+				VlnXmlElement sch = curelem;
+				if (curelem.ParentNode.Name != "RO_Root") sch = (VlnXmlElement) sch.ParentNode;
+				myschema = myrodb.RODB_GetGroupSchema(sch);
 				if (myschema==null)
 				{
 					MessageBox.Show("Subgroup Definition does not exist, check Subgroup Definition under Properties for the Group that contains this Subgroup.");