diff --git a/.gitattributes b/.gitattributes
index a93cb307f49..d517de4a34f 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -6911,6 +6911,7 @@ res/cardsfolder/m/matsu_tribe_decoy.txt -text
 res/cardsfolder/m/matsu_tribe_sniper.txt svneol=native#text/plain
 res/cardsfolder/m/maul_splicer.txt svneol=native#text/plain
 res/cardsfolder/m/mausoleum_guard.txt -text
+res/cardsfolder/m/mausoleum_turnkey.txt -text
 res/cardsfolder/m/maw_of_the_mire.txt -text
 res/cardsfolder/m/maw_of_the_obzedat.txt -text
 res/cardsfolder/m/mawcor.txt svneol=native#text/plain
diff --git a/res/cardsfolder/h/hunt_the_hunter.txt b/res/cardsfolder/h/hunt_the_hunter.txt
index bcf0d0fe7a6..250ef39796b 100644
--- a/res/cardsfolder/h/hunt_the_hunter.txt
+++ b/res/cardsfolder/h/hunt_the_hunter.txt
@@ -4,5 +4,6 @@ Types:Sorcery
 A:SP$ Pump | Cost$ G | ValidTgts$ Creature.YouCtrl+Green | TgtPrompt$ Select target green creature you control | SubAbility$ DBFight | NumAtt$ +2 | NumDef$ +2 | SpellDescription$ Target green creature you control gets +2/+2 until end of turn. It fights target green creature an opponent controls.
 SVar:DBFight:DB$ Fight | Defined$ ParentTarget | ValidTgts$ Creature.OppCtrl+Green | TgtPrompt$ Select target green creature an opponent controls
 SVar:RemRandomDeck:True
+SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/hunt_the_hunter.jpg
 Oracle:Target green creature you control gets +2/+2 until end of turn. It fights target green creature an opponent controls.
\ No newline at end of file
diff --git a/res/cardsfolder/m/mausoleum_turnkey.txt b/res/cardsfolder/m/mausoleum_turnkey.txt
new file mode 100644
index 00000000000..ff082f3f65e
--- /dev/null
+++ b/res/cardsfolder/m/mausoleum_turnkey.txt
@@ -0,0 +1,9 @@
+Name:Mausoleum Turnkey
+ManaCost:3 B
+Types:Creature Ogre Rogue
+PT:3/2
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZone | RememberController$ True | TriggerDescription$ When CARDNAME enters the battlefield, return target creature card of an opponent's choice from your graveyard to your hand.
+SVar:TrigChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | ValidTgts$ Creature.RememberedPlayerCtrl | TargetingPlayer$ Opponent | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:Picture:http://www.wizards.com/global/images/magic/general/mausoleum_turnkey.jpg
+Oracle:When Mausoleum Turnkey enters the battlefield, return target creature card of an opponent's choice from your graveyard to your hand.
\ No newline at end of file
diff --git a/src/main/java/forge/card/trigger/TriggerHandler.java b/src/main/java/forge/card/trigger/TriggerHandler.java
index 42bd4571122..482cc70f80a 100644
--- a/src/main/java/forge/card/trigger/TriggerHandler.java
+++ b/src/main/java/forge/card/trigger/TriggerHandler.java
@@ -377,6 +377,10 @@ public class TriggerHandler {
             sa.setActivatingPlayer(p);
         }
 
+        if (triggerParams.containsKey("RememberController")) {
+            host.addRemembered(sa.getActivatingPlayer());
+        }
+
         sa.setStackDescription(sa.toString());
         if (sa.getApi() == ApiType.Charm && !sa.isWrapper()) {
             CharmEffect.makeChoices(sa);