diff --git a/Knight/knight.html b/Knight/knight.html
index 556146f241..7445552298 100644
--- a/Knight/knight.html
+++ b/Knight/knight.html
@@ -4478,7 +4478,7 @@ function getWeaponsContactAS(prefix, AS, hasArmure, isSilencieux, isMeurtrier, i
 
     if (hasArmure) { vSurMesure += oCombat; }
 
-    bAttaque.push(vSurMesure);
+    bDegats.push(vSurMesure);
     exec.push(`{{vSurMesure=${vSurMesure}}}`);
   }
 
@@ -7845,13 +7845,14 @@ on('change:slotsUDCLTeteTot change:slotsUDCLTorseTot change:slotsUDCLBGTot chang
   if (msg !== '') { setPanneauInformation(msg, true, true); } else { resetPanneauInformation(); }
 });
 
-on('change:repeating_equipDefensif:porte change:repeating_equipDefensif:defenseBonus change:repeating_equipDefensif:reactionBonus', async () => {
+on('change:repeating_equipDefensif:porte change:repeating_equipDefensif:defenseBonus change:repeating_equipDefensif:reactionBonus', async (eventInfo) => {
   const attrs = await getAttrsAsync([
     'repeating_equipDefensif_defenseBonus',
     'repeating_equipDefensif_reactionBonus',
     'repeating_equipDefensif_porte',
   ]);
 
+  const id = eventInfo.sourceAttribute.split('_')[2];
   const equipe = +attrs.repeating_equipDefensif_porte;
 
   let defense = 0;
@@ -7862,10 +7863,12 @@ on('change:repeating_equipDefensif:porte change:repeating_equipDefensif:defenseB
     reaction = +attrs.repeating_equipDefensif_reactionBonus;
   }
 
-  await setAttrsAsync({
-    repeating_equipDefensif_defLigne: defense,
-    repeating_equipDefensif_reaLigne: reaction,
-  });
+  const update = {};
+
+  update[`repeating_equipDefensif_${id}_defLigne`] = defense;
+  update[`repeating_equipDefensif_${id}_reaLigne`] = reaction;
+
+  await setAttrsAsync(update);
 });
 
 on('change:repeating_equipDefensif:reaLigne remove:repeating_equipDefensif:reaLigne', () => {
@@ -53050,10 +53053,6 @@ on('clicked:rollVehicule', async (info) => {
 				<span class="full"><span data-i18n="warrior-inclus">Bonus du type de la warrior inclus</span> ({{vODMALWarrior}})</span>
 			{{/vODMALWarrior}}
 
-			{{#vSurMesure}}
-				<span class="full"><span data-i18n="sur-mesure-inclus">Sur mesure inclus</span> ({{vSurMesure}})</span>
-			{{/vSurMesure}}
-
 			{{#vMDrone}}
 				<span class="full"><span data-i18n="munitions-drones-inclus">Munitions drones inclus</span> ({{vMDrone}})</span>
 			{{/vMDrone}}
@@ -53224,6 +53223,9 @@ on('clicked:rollVehicule', async (info) => {
 			{{#vSournoise}}
 				<span class="full"><span data-i18n="sournoise-inclus">Bonus sournoise inclus</span> ({{vSournoise}})</span>
 			{{/vSournoise}}
+			{{#vSurMesure}}
+				<span class="full"><span data-i18n="sur-mesure-inclus">Sur mesure inclus</span> ({{vSurMesure}})</span>
+			{{/vSurMesure}}
 			{{#vPrecision}}
 				<span class="full"><span data-i18n="precision-inclus">Bonus precision inclus</span> ({{vPrecision}})</span>
 			{{/vPrecision}}
diff --git a/Knight/pug/html/templates/combat.html b/Knight/pug/html/templates/combat.html
index 1f2588a4cc..e8c03b7f9b 100644
--- a/Knight/pug/html/templates/combat.html
+++ b/Knight/pug/html/templates/combat.html
@@ -114,10 +114,6 @@
 				<span class="full"><span data-i18n="warrior-inclus">Bonus du type de la warrior inclus</span> ({{vODMALWarrior}})</span>
 			{{/vODMALWarrior}}
 
-			{{#vSurMesure}}
-				<span class="full"><span data-i18n="sur-mesure-inclus">Sur mesure inclus</span> ({{vSurMesure}})</span>
-			{{/vSurMesure}}
-
 			{{#vMDrone}}
 				<span class="full"><span data-i18n="munitions-drones-inclus">Munitions drones inclus</span> ({{vMDrone}})</span>
 			{{/vMDrone}}
@@ -288,6 +284,9 @@
 			{{#vSournoise}}
 				<span class="full"><span data-i18n="sournoise-inclus">Bonus sournoise inclus</span> ({{vSournoise}})</span>
 			{{/vSournoise}}
+			{{#vSurMesure}}
+				<span class="full"><span data-i18n="sur-mesure-inclus">Sur mesure inclus</span> ({{vSurMesure}})</span>
+			{{/vSurMesure}}
 			{{#vPrecision}}
 				<span class="full"><span data-i18n="precision-inclus">Bonus precision inclus</span> ({{vPrecision}})</span>
 			{{/vPrecision}}
diff --git a/Knight/pug/js/_functionsWeapons.js b/Knight/pug/js/_functionsWeapons.js
index f05565c29e..1aff3f0bf3 100644
--- a/Knight/pug/js/_functionsWeapons.js
+++ b/Knight/pug/js/_functionsWeapons.js
@@ -1676,7 +1676,7 @@ function getWeaponsContactAS(prefix, AS, hasArmure, isSilencieux, isMeurtrier, i
 
     if (hasArmure) { vSurMesure += oCombat; }
 
-    bAttaque.push(vSurMesure);
+    bDegats.push(vSurMesure);
     exec.push(`{{vSurMesure=${vSurMesure}}}`);
   }
 
diff --git a/Knight/pug/js/knight.js b/Knight/pug/js/knight.js
index d73a7f0bd0..a6bb73a443 100644
--- a/Knight/pug/js/knight.js
+++ b/Knight/pug/js/knight.js
@@ -1442,13 +1442,14 @@ on('change:slotsUDCLTeteTot change:slotsUDCLTorseTot change:slotsUDCLBGTot chang
   if (msg !== '') { setPanneauInformation(msg, true, true); } else { resetPanneauInformation(); }
 });
 
-on('change:repeating_equipDefensif:porte change:repeating_equipDefensif:defenseBonus change:repeating_equipDefensif:reactionBonus', async () => {
+on('change:repeating_equipDefensif:porte change:repeating_equipDefensif:defenseBonus change:repeating_equipDefensif:reactionBonus', async (eventInfo) => {
   const attrs = await getAttrsAsync([
     'repeating_equipDefensif_defenseBonus',
     'repeating_equipDefensif_reactionBonus',
     'repeating_equipDefensif_porte',
   ]);
 
+  const id = eventInfo.sourceAttribute.split('_')[2];
   const equipe = +attrs.repeating_equipDefensif_porte;
 
   let defense = 0;
@@ -1459,10 +1460,12 @@ on('change:repeating_equipDefensif:porte change:repeating_equipDefensif:defenseB
     reaction = +attrs.repeating_equipDefensif_reactionBonus;
   }
 
-  await setAttrsAsync({
-    repeating_equipDefensif_defLigne: defense,
-    repeating_equipDefensif_reaLigne: reaction,
-  });
+  const update = {};
+
+  update[`repeating_equipDefensif_${id}_defLigne`] = defense;
+  update[`repeating_equipDefensif_${id}_reaLigne`] = reaction;
+
+  await setAttrsAsync(update);
 });
 
 on('change:repeating_equipDefensif:reaLigne remove:repeating_equipDefensif:reaLigne', () => {