diff --git a/commands/drop.js b/commands/drop.js
index f16a398..c916323 100644
--- a/commands/drop.js
+++ b/commands/drop.js
@@ -44,20 +44,14 @@ module.exports = {
         const row = new ActionRowBuilder();
         let deckImage = await Rendering.renderCardStack(cards);
 
-        for (const [i, card] of cards.entries()) {
-            let character = await Character.findOne({
-                where: {
-                    id: card.characterId
-                }
-            });
-        
+        for (let i = 0; i < cards.length; i++) {
             //Add claim button for each card
             row.addComponents(
 				new ButtonBuilder()
-					.setCustomId(`claim-${i}-${card.identifier}`)
+					.setCustomId(`claim-${i}-${cards[i].identifier}`)
 					.setLabel(`Claim  ${i+1}`)
 					.setStyle(ButtonStyle.Primary),
-			);
+			);            
         }
 
         const file = new AttachmentBuilder(deckImage);
diff --git a/util/rendering.js b/util/rendering.js
index 4323baa..ec06f7b 100644
--- a/util/rendering.js
+++ b/util/rendering.js
@@ -57,7 +57,7 @@ module.exports = {
             return './assets/cards/card_cover.png';
         }
 
-        let hash = crypto.createHash('md5').update(character.imageIdentifier + card.quality).digest('hex');
+        let hash = crypto.createHash('md5').update(character.imageIdentifier + card.quality + (card.userId == 1 ? 'unclaimed' : 'claimed')).digest('hex');
         //TODO: Add switch to turn off or bypass caching
         if (fs.existsSync(`./assets/image_cache/${hash}.gif`)) {
             return `./assets/image_cache/${hash}.gif`;
@@ -78,8 +78,9 @@ module.exports = {
         await cardImage.composite([
             {input: border, top:0, left: 0, tile: true},
             {input: label, top:0, left: 0, tile: true}]);
+        //BUGBUG: Grayscale does not apply to card border
         if (card.userId === 1) {
-            cardImage.grayscale()
+            await cardImage.grayscale()
             .modulate({
                 brightness: 0.5
             });