diff --git a/PROMS/Volian.Controls.Library/DisplayRO.cs b/PROMS/Volian.Controls.Library/DisplayRO.cs
index ccfa2bb5..9b45fce4 100644
--- a/PROMS/Volian.Controls.Library/DisplayRO.cs
+++ b/PROMS/Volian.Controls.Library/DisplayRO.cs
@@ -388,7 +388,7 @@ namespace Volian.Controls.Library
 					{
 						string linktxt = string.Format(@"#Link:ReferencedObject:<NewID> {0} {1}", roch.roid, _MyROFST.MyRODb.RODbID);
 						// Resolve symbols and scientific notation in the RO return value
-						_MyRTB.InsertRO(ConvertSymbolsAndStuff(tbROValue.Text), linktxt);
+						_MyRTB.InsertRO(ConvertSymbolsAndStuff(selectedChld.value), linktxt);
 					}
 					_MyRTB.inRoAdd = false;
 				}
@@ -427,7 +427,7 @@ namespace Volian.Controls.Library
 						errormsg = (replacingRO) ? "a Figure with a non-figure." : "a table into a Figure type.";
 						goodToGo = false;
 					}
-					else if (_MyRTB.MyItemInfo.MyContent.Type != 20007) //(!_MyRTB.MyItemInfo.IsTable) // Not in a table substep type
+					else if (!_MyRTB.MyItemInfo.IsTable)
 					{
 						errormsg = (replacingRO) ? "a non-table RO with a Table RO." : "a table into a non-table type.";
 						//TODO: Prompt user to insert a new Table substep type and place this RO into it