diff --git a/airtime_mvc/application/controllers/LibraryController.php b/airtime_mvc/application/controllers/LibraryController.php
index f291c1bdc..2bfa074f7 100644
--- a/airtime_mvc/application/controllers/LibraryController.php
+++ b/airtime_mvc/application/controllers/LibraryController.php
@@ -333,11 +333,10 @@ class LibraryController extends Zend_Controller_Action
                 }
                 $this->view->block = $block;
             } else if ($type == "stream") {
-                    
                 $webstream = CcWebstreamQuery::create()->findPK($id);
-                $file = new Application_Model_Webstream($webstream);
+                $ws = new Application_Model_Webstream($webstream);
 
-                $md = $file->getMetadata();
+                $md = $ws->getMetadata();
 
                 $this->view->md = $md;
                 $this->view->type = $type;
diff --git a/airtime_mvc/application/models/Webstream.php b/airtime_mvc/application/models/Webstream.php
index 940989b72..cdbd14af0 100644
--- a/airtime_mvc/application/models/Webstream.php
+++ b/airtime_mvc/application/models/Webstream.php
@@ -53,8 +53,7 @@ class Application_Model_Webstream{
 
     public function getMetadata()
     {
-        $webstream = CcWebstreamQuery::create()->findPK($this->id);
-        $subjs = CcSubjsQuery::create()->findPK($webstream->getDbCreatorId());
+        $subjs = CcSubjsQuery::create()->findPK($this->webstream->getDbCreatorId());
 
         $username = $subjs->getDbLogin();
         return array(