diff --git a/application/Building/Building.php b/application/Building/Building.php
index 2d6a35804..3c02a4039 100644
--- a/application/Building/Building.php
+++ b/application/Building/Building.php
@@ -267,7 +267,7 @@ class Building extends mfBaseModel {
       if($name == "pipeworker") {
         $pipeworker = mfValuecache::singleton()->get("mfObjectmodel-Address-".$this->pipeworker_id);
         if(!$pipeworker) {
-           $pipeworker = new Buildingstatus($this->pipeworker_id);
+           $pipeworker = new Address($this->pipeworker_id);
            mfValuecache::singleton()->set("mfObjectmodel-Address-".$this->pipeworker_id, $pipeworker);
         }
         $this->pipeworker = $pipeworker;