diff --git a/module/data/fields/action/damageField.mjs b/module/data/fields/action/damageField.mjs
index 6efa1f51..c4295e0d 100644
--- a/module/data/fields/action/damageField.mjs
+++ b/module/data/fields/action/damageField.mjs
@@ -118,9 +118,9 @@ export default class DamageField extends fields.SchemaField {
                 const hpDamageMultiplier = config.actionActor?.system.rules?.attack?.damage?.hpDamageMultiplier ?? 1;
                 const hpDamageTakenMultiplier = actor.system.rules?.attack?.damage?.hpDamageTakenMultiplier;
                 if (configDamage.hitPoints) {
-                    configDamage.hitPoints.roll = configDamage.hitPoints.roll.toJSON();
-                    configDamage.hitPoints.roll.total = Math.ceil(
-                        configDamage.hitPoints.roll.total * hpDamageMultiplier * hpDamageTakenMultiplier
+                    configDamage.hitPoints = configDamage.hitPoints.toJSON();
+                    configDamage.hitPoints.total = Math.ceil(
+                        configDamage.hitPoints.total * hpDamageMultiplier * hpDamageTakenMultiplier
                     );
                 }
 
diff --git a/module/documents/actor.mjs b/module/documents/actor.mjs
index b85c13d5..d7733dd5 100644
--- a/module/documents/actor.mjs
+++ b/module/documents/actor.mjs
@@ -660,12 +660,12 @@ export default class DhpActor extends Actor {
 
         Object.entries(damages).forEach(([key, damage]) => {
             if (key === CONFIG.DH.GENERAL.healingTypes.hitPoints.id)
-                damage.roll.total = this.calculateDamage(damage.roll.total, damage.damageTypes);
+                damage.total = this.calculateDamage(damage.total, damage.damageTypes);
             const update = updates.find(u => u.key === key);
             if (update) {
-                update.value += damage.roll.total;
+                update.value += damage.total;
                 update.damageTypes.add(...new Set(damage.damageTypes));
-            } else updates.push({ value: damage.roll.total, key, damageTypes: new Set(damage.damageTypes) });
+            } else updates.push({ value: damage.total, key, damageTypes: new Set(damage.damageTypes) });
         });
 
         if (Hooks.call(`${CONFIG.DH.id}.postCalculateDamage`, this, damages) === false) return null;