diff --git a/Mage.Sets/src/mage/cards/s/ShinryuTranscendentRival.java b/Mage.Sets/src/mage/cards/s/ShinryuTranscendentRival.java
index 3fdbaeda184..8775979f768 100644
--- a/Mage.Sets/src/mage/cards/s/ShinryuTranscendentRival.java
+++ b/Mage.Sets/src/mage/cards/s/ShinryuTranscendentRival.java
@@ -120,13 +120,14 @@ class ShinryuTranscendentRivalTriggeredAbility extends TriggeredAbilityImpl {
 
     @Override
     public boolean checkEventType(GameEvent event, Game game) {
-        return event.getType() == GameEvent.EventType.LOSES;
+        return event.getType() == GameEvent.EventType.LOST;
     }
 
     @Override
     public boolean checkTrigger(GameEvent event, Game game) {
+        int zcc = game.getState().getZoneChangeCounter(this.getSourceId());
         return Optional
-                .ofNullable(this.getId() + "_" + this.getSourceObjectZoneChangeCounter() + "_opponent")
+                .of(this.getSourceId() + "_" + zcc + "_opponent")
                 .map(game.getState()::getValue)
                 .map(event.getPlayerId()::equals)
                 .orElse(false);
diff --git a/Mage.Sets/src/mage/cards/z/ZenosYaeGalvus.java b/Mage.Sets/src/mage/cards/z/ZenosYaeGalvus.java
index 5db0ae321ec..d808e24232d 100644
--- a/Mage.Sets/src/mage/cards/z/ZenosYaeGalvus.java
+++ b/Mage.Sets/src/mage/cards/z/ZenosYaeGalvus.java
@@ -88,10 +88,11 @@ enum ZenosYaeGalvusPredicate implements ObjectSourcePlayerPredicate<Permanent> {
 
     @Override
     public boolean apply(ObjectSourcePlayer<Permanent> input, Game game) {
+        int zcc = game.getState().getZoneChangeCounter(input.getSource().getSourceId());
         return flag == Optional
-                .ofNullable(CardUtil.getObjectZoneString(
+                .of(CardUtil.getObjectZoneString(
                         "chosenCreature", input.getSource().getSourceId(), game,
-                        input.getSource().getSourceObjectZoneChangeCounter(), false
+                        zcc, false
                 ))
                 .map(game.getState()::getValue)
                 .filter(MageObjectReference.class::isInstance)