diff --git a/forge-gui/res/cardsfolder/m/mindclaw_shaman.txt b/forge-gui/res/cardsfolder/m/mindclaw_shaman.txt
index ace641e7eda..0b9d443fc9d 100644
--- a/forge-gui/res/cardsfolder/m/mindclaw_shaman.txt
+++ b/forge-gui/res/cardsfolder/m/mindclaw_shaman.txt
@@ -3,7 +3,8 @@ ManaCost:4 R
 Types:Creature Viashino Shaman
 PT:2/2
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigReveal | TriggerDescription$ When CARDNAME enters the battlefield, target opponent reveals his or her hand. You may cast an instant or sorcery card from it without paying its mana cost.
-SVar:TrigReveal:DB$ RevealHand | ValidTgts$ Opponent | TgtPrompt$ Select target opponent | SubAbility$ TrigPlay
-SVar:TrigPlay:DB$ Play | Valid$ Instant.TargetedPlayerCtrl,Sorcery.TargetedPlayerCtrl | ValidZone$ Hand | WithoutManaCost$ True | Optional$ True
+SVar:TrigReveal:DB$ RevealHand | ValidTgts$ Opponent | TgtPrompt$ Select target opponent | RememberTargets$ True | SubAbility$ TrigPlay
+SVar:TrigPlay:DB$ Play | Valid$ Instant.RememberedPlayerCtrl,Sorcery.RememberedPlayerCtrl | ValidZone$ Hand | WithoutManaCost$ True | Optional$ True | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mindclaw_shaman.jpg
 Oracle:When Mindclaw Shaman enters the battlefield, target opponent reveals his or her hand. You may cast an instant or sorcery card from it without paying its mana cost.
\ No newline at end of file