diff --git a/daggerheart.mjs b/daggerheart.mjs
index 31c9f63d..4641c34a 100644
--- a/daggerheart.mjs
+++ b/daggerheart.mjs
@@ -24,7 +24,7 @@ import TokenManager from './module/documents/tokenManager.mjs';
 CONFIG.DH = SYSTEM;
 CONFIG.TextEditor.enrichers.push(...enricherConfig);
 
-CONFIG.Dice.rolls = [BaseRoll, DHRoll, DualityRoll, D20Roll, DamageRoll, FateRoll];
+CONFIG.Dice.rolls = [Roll = BaseRoll, DHRoll, DualityRoll, D20Roll, DamageRoll, FateRoll];
 CONFIG.Dice.daggerheart = {
     DHRoll: DHRoll,
     DualityRoll: DualityRoll,
diff --git a/module/dice/baseRoll.mjs b/module/dice/baseRoll.mjs
index 4d065fff..2c42d38a 100644
--- a/module/dice/baseRoll.mjs
+++ b/module/dice/baseRoll.mjs
@@ -4,4 +4,8 @@ export default class BaseRoll extends Roll {
 
     /** @inheritdoc */
     static TOOLTIP_TEMPLATE = 'systems/daggerheart/templates/ui/chat/foundryRollTooltip.hbs';
+
+    get modifierTotal() {
+        return this.total - this.dice.reduce((acc, dice) => acc + dice.total, 0);
+    }
 }
diff --git a/templates/dialogs/tagTeamDialog/parts/tagTeamDamageParts.hbs b/templates/dialogs/tagTeamDialog/parts/tagTeamDamageParts.hbs
index 5f37c6d1..1d516cd8 100644
--- a/templates/dialogs/tagTeamDialog/parts/tagTeamDamageParts.hbs
+++ b/templates/dialogs/tagTeamDialog/parts/tagTeamDamageParts.hbs
@@ -2,7 +2,7 @@
     <div class="roll-data {{#if isCritical}}critical{{/if}}">
         <div class="duality-label">
             <span>{{localize (concat "DAGGERHEART.CONFIG.HealingType." key ".name")}}:</span>
-            <span>{{damage.roll.total}}</span>
+            <span>{{roll.total}}</span>
         </div>
 
         <div class="roll-dice-container">
diff --git a/templates/ui/chat/parts/damage-part.hbs b/templates/ui/chat/parts/damage-part.hbs
index 43fc3a6f..d4d1c9fe 100644
--- a/templates/ui/chat/parts/damage-part.hbs
+++ b/templates/ui/chat/parts/damage-part.hbs
@@ -39,7 +39,7 @@
                                         {{#if active}}
                                             <div class="roll-die{{#unless @../first}} has-plus{{/unless}}">
                                                 <div 
-                                                    class="dice reroll-button {{../dice}}" 
+                                                    class="dice reroll-button {{../denomination}}" 
                                                     data-die-index="0" data-type="damage" data-damage-type="{{@../../key}}" data-dice="{{@../key}}" data-result="{{@key}}"
                                                 >
                                                     {{#if hasRerolls}}<i class="fa-solid fa-dice dice-rerolled" data-tooltip="{{localize "DAGGERHEART.GENERAL.rerolled"}}"></i>{{/if}}
@@ -49,6 +49,7 @@
                                         {{/if}}
                                     {{/each}}
                                 {{/each}}
+                                
                                 {{#if roll.modifierTotal}}
                                     <div class="roll-die{{#if (gt roll.modifierTotal 0)}} has-plus{{/if}}">
                                         <div class="font-20">{{roll.modifierTotal}}</div>