diff --git a/include/objectManager.php b/include/objectManager.php
index d31f92a..1b2737a 100644
--- a/include/objectManager.php
+++ b/include/objectManager.php
@@ -159,13 +159,13 @@ class ObjectManager
 
             // if there is no class set for a given row use the
             // default one in $sColor
-            if(!$this->oTableRow->oTableRow->GetClass())
+            if(!$this->oTableRow->GetTableRow()->GetClass())
             {
-                $this->oTableRow->oTableRow->SetClass($sColor);
+                $this->oTableRow->GetTableRow()->SetClass($sColor);
             }
 
             // if this row is clickable, make it highlight appropirately
-            $oTableRowClick = $this->oTableRow->oTableRow->GetTableRowClick();
+            $oTableRowClick = $this->oTableRow->GetTableRow()->GetTableRowClick();
             if($oTableRowClick)
             {
               $oTableRowHighlight = GetStandardRowHighlight($iCount);
@@ -178,7 +178,7 @@ class ObjectManager
             if($oObject->canEdit())
             {
                 $shDeleteLink = "";
-                if($this->oTableRow->bHasDeleteLink)
+                if($this->oTableRow->GetHasDeleteLink())
                 {
                   $shDeleteLink = ' [&nbsp;<a href="'.$this->makeUrl("delete", $oObject->objectGetId()).
                     '">delete</a>&nbsp;]';
diff --git a/include/table.php b/include/table.php
index 1a52751..7dfc4b1 100644
--- a/include/table.php
+++ b/include/table.php
@@ -345,6 +345,11 @@ class OMTableRow
   {
     return $this->oTableRow->GetString();
   }
+
+  function GetTableRow()
+  {
+    return $this->oTableRow;
+  }
 }
 
 class Table