diff --git a/modules/donjon-et-cie-utility.mjs b/modules/donjon-et-cie-utility.mjs
index a4e85aa..8e07df6 100644
--- a/modules/donjon-et-cie-utility.mjs
+++ b/modules/donjon-et-cie-utility.mjs
@@ -76,8 +76,8 @@ export class DonjonEtCieUtility {
     const scene = canvas?.scene ?? game.scenes?.current;
     const tokens = scene?.tokens?.contents ?? [];
     
-    const targetedTokens = game.user?.targets ?? [];
-    const targetedTokenUuid = targetedTokens[0]?.uuid ?? null;
+    const targetedTokens = game.user?.targets ?? new Set();
+    const targetedTokenUuid = targetedTokens?.first()?.document.uuid ?? null;
 
     return tokens
       .map((token) => {