diff --git a/module/measurement/model.php b/module/measurement/model.php
index 32d150f6ca..ef3069d48e 100644
--- a/module/measurement/model.php
+++ b/module/measurement/model.php
@@ -1043,10 +1043,6 @@ class measurementModel extends model
             list($headers, $reportData) = $this->report->processData($dataList, $condition);
 
             $headerNames = $this->report->getHeaderNames($fields, $moduleNames, $condition);
-            $headers     = $headers;
-            $condition   = $condition;
-            $reportData  = $reportData;
-            $groupLang   = $groupLang;
         }
 
         $fields = empty($mergeFields) ? array() : $mergeFields;
diff --git a/module/measurement/view/complextemplate.html.php b/module/measurement/view/complextemplate.html.php
index 8f4fca2d14..7e86e5b170 100644
--- a/module/measurement/view/complextemplate.html.php
+++ b/module/measurement/view/complextemplate.html.php
@@ -19,8 +19,8 @@
         <td><?php echo $template->createdBy;?></td>
         <td><?php echo $template->createdDate;?></td>
         <td class='c-actions'>
-          <?php echo common::printIcon('measurement', 'editTemplate', "id=$template->id", $template, '', 'edit', '', '', '', '', $lang->measurement->editTemplate);?>
-          <?php echo common::printIcon('measurement', 'viewTemplate', "id=$template->id", $template, '', 'eye', '', '', '', $lang->measurement->viewTemplate);?>
+          <?php common::printIcon('measurement', 'editTemplate', "id=$template->id", $template, '', 'edit', '', '', '', '', $lang->measurement->editTemplate);?>
+          <?php common::printIcon('measurement', 'viewTemplate', "id=$template->id", $template, '', 'eye', '', '', '', $lang->measurement->viewTemplate);?>
         </td>
       </tr>
       <?php endforeach;?>