diff --git a/module/applications/dialogs/d20RollDialog.mjs b/module/applications/dialogs/d20RollDialog.mjs
index 987cfeb1..1aa3f0fa 100644
--- a/module/applications/dialogs/d20RollDialog.mjs
+++ b/module/applications/dialogs/d20RollDialog.mjs
@@ -123,7 +123,7 @@ export default class D20RollDialog extends HandlebarsApplicationMixin(Applicatio
             context.advantage = this.config.roll?.advantage;
             context.disadvantage = this.config.roll?.disadvantage;
             context.diceOptions = CONFIG.DH.GENERAL.diceTypes;
-            context.diceFaces = CONFIG.DH.GENERAL.dieFaces.reduce((acc, face) => {
+            context.dieFaces = CONFIG.DH.GENERAL.dieFaces.reduce((acc, face) => {
                 acc[face] = `d${face}`;
                 return acc;
             }, {});
@@ -156,12 +156,7 @@ export default class D20RollDialog extends HandlebarsApplicationMixin(Applicatio
         }
         if (this.config.uses) this.config.uses = foundry.utils.mergeObject(this.config.uses, rest.uses);
         if (rest.roll?.dice) {
-            Object.entries(rest.roll.dice).forEach(([key, value]) => {
-                if(key === 'advantageFaces')
-                    this.roll[key] = Number.parseInt(value);
-                else 
-                    this.roll[key] = value;
-            });
+            this.roll = foundry.utils.mergeObject(this.roll, rest.roll.dice)
         }
         if (rest.hasOwnProperty('trait')) {
             this.config.roll.trait = rest.trait;
diff --git a/templates/dialogs/dice-roll/rollSelection.hbs b/templates/dialogs/dice-roll/rollSelection.hbs
index 6a28cdac..2c1a21b6 100644
--- a/templates/dialogs/dice-roll/rollSelection.hbs
+++ b/templates/dialogs/dice-roll/rollSelection.hbs
@@ -157,8 +157,8 @@
                                         <option value="{{add this 1}}" {{#if (eq @root.roll.advantageNumber (add this 1))}} selected{{/if}}>{{add this 1}}</option>
                                     {{/times}}
                                 </select>
-                                <select name="roll.dice.advantageFaces"{{#unless advantage}} disabled{{/unless}}>
-                                    {{selectOptions diceFaces selected=@root.roll.advantageFaces}}
+                                <select name="roll.dice.advantageFaces"{{#unless advantage}} disabled{{/unless}} data-dtype="Number">
+                                    {{selectOptions dieFaces selected=@root.roll.advantageFaces}}
                                 </select>
                             </div>
                             {{#if abilities}}