diff --git a/module/metric/model.php b/module/metric/model.php
index 2d07f23bc6..0f24177ead 100644
--- a/module/metric/model.php
+++ b/module/metric/model.php
@@ -1192,15 +1192,26 @@ class metricModel extends model
      */
     public function processOldMetrics($metrics)
     {
-        $oldMetricList = $this->getOldMetricList();
-
         $metricList = array();
-        foreach($metrics as $metric)
+        if(!in_array($this->config->edition, array('max', 'ipd')))
         {
-            $metric->isOldMetric = $this->isOldMetric($metric);
-            if($metric->isOldMetric) $metric->unit = $oldMetricList[$metric->fromID]->unit;
+            foreach($metrics as $metric)
+            {
+                $metric->isOldMetric = false;
+                $metricList[] = $metric;
+            }
+        }
+        else
+        {
+            $oldMetricList = $this->getOldMetricList();
 
-            $metricList[] = $metric;
+            foreach($metrics as $metric)
+            {
+                $metric->isOldMetric = $this->isOldMetric($metric);
+                if($metric->isOldMetric) $metric->unit = $oldMetricList[$metric->fromID]->unit;
+
+                $metricList[] = $metric;
+            }
         }
 
         return $metricList;
diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index 308e094c29..810bba8b2b 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -703,7 +703,7 @@ class upgradeModel extends model
                 $this->removeProductLineRequired();
                 break;
             case '18_7':
-                if(in_array($this->config->edition, array('max', 'ipd'))) $this->processOldMetrics();
+                if(!in_array($this->config->edition, array('max', 'ipd'))) $this->processOldMetrics();
                 break;
         }