diff --git a/application/Building/Building.php b/application/Building/Building.php
index 832d08bc3..bdc79ca6b 100644
--- a/application/Building/Building.php
+++ b/application/Building/Building.php
@@ -79,6 +79,14 @@ class Building extends mfBaseModel {
     return $code;
   }
   
+  public function loadWorkflowItems() {
+    foreach(WorkflowitemModel::search(["object_type" => "building", "active" => 1]) as $item) {
+      $item->setObjectId($this->id);
+      $this->workflowitems[$item->name] = $item;
+      mfValuecache::set("wfBuilding-".$item->name, $item);
+    }
+  }
+  
   public function getWorkflowvalue($itemname, $type = false) {
     $item = mfValuecache::get("wfBuilding-".$itemname);
     if(!$item) {
@@ -190,6 +198,7 @@ class Building extends mfBaseModel {
       }
       
       if($name == "workflowitems") {
+        $this->loadWorkflowItems();
         foreach(WorkflowitemModel::search(["object_type" => "building", "active" => 1]) as $item) {
           $item->setObjectId($this->id);
           $this->workflowitems[$item->name] = $item;
diff --git a/application/Termination/Termination.php b/application/Termination/Termination.php
index 4f2b2f8b1..5a394d659 100644
--- a/application/Termination/Termination.php
+++ b/application/Termination/Termination.php
@@ -35,6 +35,14 @@ class Termination extends mfBaseModel {
     return $address;
   }
   
+  public function loadWorkflowItems() {
+    foreach(WorkflowitemModel::search(["object_type" => "Termination", "active" => 1]) as $item) {
+      $item->setObjectId($this->id);
+      $this->workflowitems[$item->name] = $item;
+      mfValuecache::set("wfTerm-".$item->name, $item);
+    }
+  }
+  
   public function getWorkflowvalue($itemname, $type = false) {
     $item = mfValuecache::get("wfTerm-".$itemname);
     if(!$item) {
@@ -239,10 +247,11 @@ class Termination extends mfBaseModel {
       }
       
       if($name == "workflowitems") {
-        foreach(WorkflowitemModel::search(["object_type" => "Termination", "active" => 1]) as $item) {
+        $this->loadWorkflowItems();
+        /*foreach(WorkflowitemModel::search(["object_type" => "Termination", "active" => 1]) as $item) {
           $item->setObjectId($this->id);
           $this->workflowitems[$item->name] = $item;
-        }
+        }*/
         //var_dump($this->workflowitems);exit;
         return $this->workflowitems;
       }