diff --git a/module/bug/control.php b/module/bug/control.php
index 54a5b17bef..ecc58d4730 100644
--- a/module/bug/control.php
+++ b/module/bug/control.php
@@ -287,8 +287,7 @@ class bug extends control
         {
             $this->bug->activate($bugID);
             if(dao::isError()) die(js::error(dao::getError()));
-            $this->loadModel('file');
-            $files = $this->file->saveUpload('files', 'bug', $bugID);
+            $files = $this->loadModel('file')->saveUpload('files', 'bug', $bugID);
             $actionID = $this->action->create('bug', $bugID, 'Activated', $this->post->comment);
             $this->sendmail($bugID, $actionID);
             die(js::locate($this->createLink('bug', 'view', "bugID=$bugID"), 'parent'));
diff --git a/module/bug/model.php b/module/bug/model.php
index 38b1ff157f..85846197ba 100644
--- a/module/bug/model.php
+++ b/module/bug/model.php
@@ -165,7 +165,7 @@ class bugModel extends model
             ->add('duplicateBug', 0)
             ->add('lastEditedBy',   $this->app->user->account)
             ->add('lastEditedDate', $now)
-            ->remove('comment')
+            ->remove('comment,files,labels')
             ->get();
 
         $this->dao->update(TABLE_BUG)->data($bug)->autoCheck()->where('id')->eq((int)$bugID)->exec();
diff --git a/module/bug/view/activate.html.php b/module/bug/view/activate.html.php
index cc7e10187e..e0547cb53a 100644
--- a/module/bug/view/activate.html.php
+++ b/module/bug/view/activate.html.php
@@ -37,10 +37,7 @@
     </tr>
     <tr>
       <th class='rowhead'><?php echo $lang->bug->files;?></th>
-      <td class='a-left'>
-        <input type='file' name='files[]' class='text-4' />
-        <input type='file' name='files[]' class='text-4' />
-      </td>
+      <td class='a-left'><?php echo $this->fetch('file', 'buildform');?></td>
     </tr>  
     <tr>
       <td colspan='2' class='a-center'>