diff --git a/5eShaped/precompiled/scripts/Settings.js b/5eShaped/precompiled/scripts/Settings.js
index 54b8c22240..8ec5bc846d 100644
--- a/5eShaped/precompiled/scripts/Settings.js
+++ b/5eShaped/precompiled/scripts/Settings.js
@@ -8,7 +8,7 @@ export class Settings {
       collectionArray: ['roll_setting', 'roll_info', 'shaped_d20'],
       callback: (v, finalSetAttrs) => {
         finalSetAttrs.roll_info = '';
-        finalSetAttrs.shaped_d20 = 'd20';
+        finalSetAttrs.shaped_d20 = 'd20@{d20_mod}';
 
         if (v.roll_setting === 'adv {{ignore=[[0') {
           finalSetAttrs.roll_info = '{{advantage=1}}';
diff --git a/5eShaped/precompiled/scripts/Upgrade.js b/5eShaped/precompiled/scripts/Upgrade.js
index 1c6bcf049d..016b85be21 100644
--- a/5eShaped/precompiled/scripts/Upgrade.js
+++ b/5eShaped/precompiled/scripts/Upgrade.js
@@ -550,7 +550,6 @@ export class Upgrade {
     }
     if (this.versionCompare(currentVersion, '4.2.0') < 0) {
       character.updateD20Mod();
-      settings.updateShapedD20();
     }
     if (this.versionCompare(currentVersion, '4.2.1') < 0) {
       this.actionComponentsToRemoveExtraFields();
@@ -595,5 +594,9 @@ export class Upgrade {
     if (this.versionCompare(currentVersion, '6.0.4') < 0) {
       this.spellEffectsNaming();
     }
+    if (this.versionCompare(currentVersion, '6.1.1') < 0) {
+      settings.updateShapedD20();
+    }
+
   }
 }