diff --git a/app/js/lib/updater.js b/app/js/lib/updater.js
index a197d61f..148a8180 100644
--- a/app/js/lib/updater.js
+++ b/app/js/lib/updater.js
@@ -1,6 +1,6 @@
 const { ipcRenderer } = require('electron');
 global.ipcRenderer = ipcRenderer;
-const currentVersion = "1.8.1";
+const currentVersion = "1.8.2";
 
 global.TEST = false;
 /********************************************************************************************
@@ -54,7 +54,7 @@ module.exports = {
     <li>Added score evaluation based on each unit's base stats</li>
 </ul>
 <h2>
-    New in v1.8.1
+    New in v1.8.1 & v1.8.2
 </h2>
 <ul class="newFeatures">
     <li>Fixing a couple bugs</li>
diff --git a/app/package.json b/app/package.json
index 7511b4e1..ca7a19dd 100644
--- a/app/package.json
+++ b/app/package.json
@@ -5,7 +5,7 @@
     "name": "Fribbels",
     "url": "https://github.com/fribbels/Fribbels-Epic-7-Optimizer"
   },
-  "version": "1.8.1",
+  "version": "1.8.2",
   "description": "Epic 7 Gear Optimizer",
   "main": "./main.prod.js",
   "scripts": {
diff --git a/backend/out/artifacts/backend_jar/backend.jar b/backend/out/artifacts/backend_jar/backend.jar
index ae34f66d..a398fc1b 100644
Binary files a/backend/out/artifacts/backend_jar/backend.jar and b/backend/out/artifacts/backend_jar/backend.jar differ
diff --git a/backend/src/main/java/com/fribbels/core/StatCalculator.java b/backend/src/main/java/com/fribbels/core/StatCalculator.java
index 1f3f41d9..ce231b56 100644
--- a/backend/src/main/java/com/fribbels/core/StatCalculator.java
+++ b/backend/src/main/java/com/fribbels/core/StatCalculator.java
@@ -130,7 +130,7 @@ public HeroStats addAccumulatorArrsToHero(final HeroStats base,
         final int dmgps = (int) ((float)dmg*spdDiv1000);
         final int mcdmg = (int) (atk * critDamage * rageMultiplier * penMultiplier);
         final int mcdmgps = (int) ((float)mcdmg*spdDiv1000);
-        final int dmgh = (int) ((cd * hp)/1000 * penMultiplier);
+        final int dmgh = (int) ((critDamage * hp)/1000 * rageMultiplier * penMultiplier);
 
         final int score = (int) (accs0[11]+accs1[11]+accs2[11]+accs3[11]+accs4[11]+accs5[11]);
 
diff --git a/backend/src/main/java/com/fribbels/gpu/GpuOptimizerKernel.java b/backend/src/main/java/com/fribbels/gpu/GpuOptimizerKernel.java
index 55745ce6..63a27e68 100644
--- a/backend/src/main/java/com/fribbels/gpu/GpuOptimizerKernel.java
+++ b/backend/src/main/java/com/fribbels/gpu/GpuOptimizerKernel.java
@@ -571,7 +571,7 @@ public void run() {
             final int dmgps = (int) ((float)dmg*spdDiv1000);
             final int mcdmg = (int) (atk * critDamage * rageMultiplier * penMultiplier);
             final int mcdmgps = (int) ((float)mcdmg*spdDiv1000);
-            final int dmgh = (int) ((cd * hp * penMultiplier)/1000);
+            final int dmgh = (int) ((critDamage * hp * rageMultiplier * penMultiplier)/1000);
 
             final int score = (int) (wScore+hScore+aScore+nScore+rScore+bScore);
             final int priority = (int) (wPrio+hPrio+aPrio+nPrio+rPrio+bPrio);
diff --git a/backend/src/main/java/com/fribbels/gpu/SetFormat000OptimizerKernel.java b/backend/src/main/java/com/fribbels/gpu/SetFormat000OptimizerKernel.java
index 4612ccea..8d93affa 100644
--- a/backend/src/main/java/com/fribbels/gpu/SetFormat000OptimizerKernel.java
+++ b/backend/src/main/java/com/fribbels/gpu/SetFormat000OptimizerKernel.java
@@ -164,7 +164,7 @@ public void run() {
             final int dmgps = (int) ((float)dmg*spdDiv1000);
             final int mcdmg = (int) (atk * critDamage * rageMultiplier * penMultiplier);
             final int mcdmgps = (int) ((float)mcdmg*spdDiv1000);
-            final int dmgh = (int) ((cd * hp * penMultiplier)/1000);
+            final int dmgh = (int) ((critDamage * hp * rageMultiplier * penMultiplier)/1000);
 
             final int score = (int) (wScore+hScore+aScore+nScore+rScore+bScore);
             final int priority = (int) (wPrio+hPrio+aPrio+nPrio+rPrio+bPrio);
diff --git a/data/jar/backend.jar b/data/jar/backend.jar
index ae34f66d..a398fc1b 100644
Binary files a/data/jar/backend.jar and b/data/jar/backend.jar differ