diff --git a/forge-game/src/main/java/forge/game/ability/AbilityUtils.java b/forge-game/src/main/java/forge/game/ability/AbilityUtils.java
index e4449e60b0a..869dde196a0 100644
--- a/forge-game/src/main/java/forge/game/ability/AbilityUtils.java
+++ b/forge-game/src/main/java/forge/game/ability/AbilityUtils.java
@@ -174,7 +174,7 @@ public class AbilityUtils {
                 }
             }
         } else if (defined.equals("DelayTriggerRemembered")) {
-            if (sa.isTrigger()) {
+            if (sa.getRootAbility().isTrigger()) {
                for (Object o : sa.getRootAbility().getTriggerRemembered()) {
                    if (o instanceof Card) {
                        cards.add(game.getCardState((Card) o));
diff --git a/forge-gui/res/cardsfolder/m/magus_of_the_jar.txt b/forge-gui/res/cardsfolder/m/magus_of_the_jar.txt
index 7464b2ac804..6f6395bb73c 100644
--- a/forge-gui/res/cardsfolder/m/magus_of_the_jar.txt
+++ b/forge-gui/res/cardsfolder/m/magus_of_the_jar.txt
@@ -4,10 +4,9 @@ Types:Creature Human Wizard
 PT:3/3
 A:AB$ ChangeZoneAll | Cost$ T Sac<1/CARDNAME> | ChangeType$ Card | Origin$ Hand | Destination$ Exile | ExileFaceDown$ True | RememberChanged$ True | SubAbility$ YouDraw | SpellDescription$ Each player exiles all cards from his or her hand face down and draws seven cards. At the beginning of the next end step, each player discards his or her hand and returns to his or her hand each card he or she exiled this way.
 SVar:YouDraw:DB$ Draw | Defined$ Each | NumCards$ 7 | SubAbility$ DelayedReturn
-SVar:DelayedReturn:DB$ DelayedTrigger | Mode$ Phase | Phase$ End of Turn | Execute$ YouDiscard | TriggerDescription$ Both players discard their hands.  Return exiled cards to their owners' hands.
-SVar:YouDiscard: AB$ Discard | Cost$ 0 | Defined$ You | Mode$ Hand | SubAbility$ OppDiscard
-SVar:OppDiscard: DB$ Discard | Defined$ Opponent | Mode$ Hand | SubAbility$ ReturnAll
-SVar:ReturnAll:DB$ ChangeZoneAll | Origin$ Exile | Destination$ Hand | ChangeType$ Card.IsRemembered | SubAbility$ DBCleanup
+SVar:DelayedReturn:DB$ DelayedTrigger | Mode$ Phase | Phase$ End of Turn | Execute$ DBDiscard | RememberObjects$ Remembered | TriggerDescription$ At the beginning of the next end step, each player discards his or her hand and returns to his or her hand each card he or she exiled this way. | SubAbility$ DBCleanup
+SVar:DBDiscard: AB$ Discard | Cost$ 0 | Defined$ Each | Mode$ Hand | SubAbility$ ReturnAll
+SVar:ReturnAll:DB$ ChangeZone | Defined$ DelayTriggerRemembered | Origin$ Exile | Destination$ Hand
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/magus_of_the_jar.jpg
diff --git a/forge-gui/res/cardsfolder/m/memory_jar.txt b/forge-gui/res/cardsfolder/m/memory_jar.txt
index 691e04f52d2..55a6b6348fa 100644
--- a/forge-gui/res/cardsfolder/m/memory_jar.txt
+++ b/forge-gui/res/cardsfolder/m/memory_jar.txt
@@ -2,11 +2,10 @@ Name:Memory Jar
 ManaCost:5
 Types:Artifact
 A:AB$ ChangeZoneAll | Cost$ T Sac<1/CARDNAME> | ChangeType$ Card | Origin$ Hand | Destination$ Exile | ExileFaceDown$ True | RememberChanged$ True | SubAbility$ DrawEach | SpellDescription$ Each player exiles all cards from his or her hand face down and draws seven cards. At the beginning of the next end step, each player discards his or her hand and returns to his or her hand each card he or she exiled this way.
-SVar:DrawEach:DB$ RepeatEach | RepeatPlayers$ Player | RepeatSubAbility$ DBDraw | SubAbility$ DelayedReturn
-SVar:DBDraw:DB$ Draw | Defined$ Player.IsRemembered | NumCards$ 7
-SVar:DelayedReturn:DB$ DelayedTrigger | Mode$ Phase | Phase$ End of Turn | Execute$ DiscardEach | TriggerDescription$ Both players discard their hands. Return exiled cards to their owners' hands.
+SVar:DrawEach:DB$ Draw | Defined$ Each | NumCards$ 7 | SubAbility$ DelayedReturn
+SVar:DelayedReturn:DB$ DelayedTrigger | Mode$ Phase | Phase$ End of Turn | Execute$ DiscardEach | RememberObjects$ Remembered | TriggerDescription$ At the beginning of the next end step, each player discards his or her hand and returns to his or her hand each card he or she exiled this way. | SubAbility$ DBCleanup
 SVar:DiscardEach:AB$ Discard | Cost$ 0 | Defined$ Each | Mode$ Hand | SubAbility$ ReturnAll
-SVar:ReturnAll:DB$ ChangeZone | Origin$ Exile | Destination$ Hand | Defined$ Remembered | SubAbility$ DBCleanup
+SVar:ReturnAll:DB$ ChangeZone | Origin$ Exile | Destination$ Hand | Defined$ DelayTriggerRemembered
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/memory_jar.jpg