diff --git a/module/helpers/utils.mjs b/module/helpers/utils.mjs
index 03dcb32c..66e743a3 100644
--- a/module/helpers/utils.mjs
+++ b/module/helpers/utils.mjs
@@ -307,8 +307,8 @@ export function updateLinkedItemApps(options, sheet) {
 export const itemAbleRollParse = (value, actor, item) => {
     if (!value) return value;
 
-    const isItemTarget = value.toLowerCase().replace('item.@', '@');
-    const slicedValue = isItemTarget ? value.slice(5) : value;
+    const isItemTarget = value.toLowerCase().includes('item.@');
+    const slicedValue = isItemTarget ? value.replaceAll(/item\.@/gi, '@') : value;
     try {
         return Roll.replaceFormulaData(slicedValue, isItemTarget ? item : actor);
     } catch (_) {
diff --git a/templates/sheets/global/partials/inventory-item-V2.hbs b/templates/sheets/global/partials/inventory-item-V2.hbs
index 46d63861..a9eb6e3b 100644
--- a/templates/sheets/global/partials/inventory-item-V2.hbs
+++ b/templates/sheets/global/partials/inventory-item-V2.hbs
@@ -241,19 +241,19 @@ Parameters:
     {{#unless hideDescription}}
     <div class="invetory-description"></div>
     {{/unless}}
-    {{!-- Dice Resource --}}
-    {{#if (and (not hideResources) (eq item.system.resource.type 'diceValue'))}}
-    {{> "systems/daggerheart/templates/sheets/global/partials/item-resource.hbs"}}
-    {{/if}}
-    {{!-- Actions Buttons --}}
-    {{#if (and showActions (eq item.type 'feature'))}}
-    <div class="item-buttons">
-      {{#each item.system.actions as | action |}}
-      <button type="button" data-action="useItem" data-item-uuid="{{action.uuid}}">
-        {{action.name}}
-      </button>
-      {{/each}}
-    </div>
-    {{/if}}
   </div>
+  {{!-- Dice Resource --}}
+  {{#if (and (not hideResources) (eq item.system.resource.type 'diceValue'))}}
+  {{> "systems/daggerheart/templates/sheets/global/partials/item-resource.hbs"}}
+  {{/if}}
+  {{!-- Actions Buttons --}}
+  {{#if (and showActions (eq item.type 'feature'))}}
+  <div class="item-buttons">
+    {{#each item.system.actions as | action |}}
+    <button type="button" data-action="useItem" data-item-uuid="{{action.uuid}}">
+      {{action.name}}
+    </button>
+    {{/each}}
+  </div>
+  {{/if}}
 </li>
diff --git a/templates/sheets/global/partials/item-resource.hbs b/templates/sheets/global/partials/item-resource.hbs
index b29c818e..85977158 100644
--- a/templates/sheets/global/partials/item-resource.hbs
+++ b/templates/sheets/global/partials/item-resource.hbs
@@ -1,21 +1,14 @@
-{{#if (eq item.system.resource.type 'simple')}}
-    <div class="item-resource">
-        <i class="{{#if item.system.resource.icon}}{{item.system.resource.icon}}{{else}}fa-solid fa-hashtag{{/if}}"></i>
-        <input type="number" class="inventory-item-resource" value="{{item.system.resource.value}}" min="0" max="{{rollParsed item.system.resource.max item.actor item true}}" />
-    </div>
-{{else}}
-    <div class="item-resources">
+<div class="item-resources">
         {{#times (rollParsed item.system.resource.max item.parent item numerical=true)}}
-            {{#with (ifThen (lookup ../item.system.resource.diceStates this) (lookup ../item.system.resource.diceStates this) this) as | state |}}
-                <a class="item-resource" data-action="toggleResourceDice" data-dice="{{#if ../../this}}{{../this}}{{else}}{{state}}{{/if}}">
-                    <div class="item-dice-resource">
-                        <label>{{ifThen state.value state.value '?'}}</label>
-                        <img src="{{concat "systems/daggerheart/assets/icons/dice/hope/" (ifThen ../../item.system.resource.dieFaces ../../item.system.resource.dieFaces ../item.system.resource.dieFaces) ".svg"}}" />
-                        {{#if state.used}}<i class="fa-solid fa-x"></i>{{/if}}
-                    </div>
-                </a>
-            {{/with}}
-        {{/times}}
-        <a data-action="handleResourceDice" data-tooltip="DAGGERHEART.APPLICATIONS.ResourceDice.rerollDice"><i class="fa-solid fa-dice resource-edit"></i></a>
-    </div>
-{{/if}}
\ No newline at end of file
+        {{#with (ifThen (lookup ../item.system.resource.diceStates this) (lookup ../item.system.resource.diceStates this) this) as | state |}}
+            <a class="item-resource" data-action="toggleResourceDice" data-dice="{{#if ../../this}}{{../this}}{{else}}{{state}}{{/if}}">
+                <div class="item-dice-resource">
+                    <label>{{ifThen state.value state.value '?'}}</label>
+                    <img src="{{concat "systems/daggerheart/assets/icons/dice/hope/" (ifThen ../../item.system.resource.dieFaces ../../item.system.resource.dieFaces ../item.system.resource.dieFaces) ".svg"}}" />
+                    {{#if state.used}}<i class="fa-solid fa-x"></i>{{/if}}
+                </div>
+            </a>
+        {{/with}}
+    {{/times}}
+    <a data-action="handleResourceDice" data-tooltip="DAGGERHEART.APPLICATIONS.ResourceDice.rerollDice"><i class="fa-solid fa-dice resource-edit"></i></a>
+</div>
\ No newline at end of file