diff --git a/Mage.Sets/src/mage/cards/t/TidusYunasGuardian.java b/Mage.Sets/src/mage/cards/t/TidusYunasGuardian.java
index 5ee2f7358b4..204b9350c26 100644
--- a/Mage.Sets/src/mage/cards/t/TidusYunasGuardian.java
+++ b/Mage.Sets/src/mage/cards/t/TidusYunasGuardian.java
@@ -16,6 +16,7 @@ import mage.constants.SuperType;
 import mage.filter.FilterPermanent;
 import mage.filter.common.FilterControlledCreaturePermanent;
 import mage.filter.predicate.other.AnotherTargetPredicate;
+import mage.filter.predicate.permanent.CounterAnyPredicate;
 import mage.target.TargetPermanent;
 import mage.target.common.TargetControlledCreaturePermanent;
 
@@ -28,9 +29,12 @@ public final class TidusYunasGuardian extends CardImpl {
 
     private static final FilterPermanent filter
             = new FilterControlledCreaturePermanent("a second target creature you control");
+    private static final FilterPermanent filter2
+            = new FilterControlledCreaturePermanent("creatures you control with counters on them");
 
     static {
         filter.add(new AnotherTargetPredicate(2));
+        filter2.add(CounterAnyPredicate.instance);
     }
 
     public TidusYunasGuardian(UUID ownerId, CardSetInfo setInfo) {
@@ -50,7 +54,7 @@ public final class TidusYunasGuardian extends CardImpl {
 
         // Cheer - Whenever one or more creatures you control with counters on them deal combat damage to a player, you may draw a card and proliferate. Do this only once each turn.
         ability = new OneOrMoreCombatDamagePlayerTriggeredAbility(
-                new DrawCardSourceControllerEffect(1), SetTargetPointer.NONE, true
+                new DrawCardSourceControllerEffect(1), SetTargetPointer.NONE, filter2, true
         ).setDoOnlyOnceEachTurn(true);
         ability.addEffect(new ProliferateEffect(false).concatBy("and"));
         this.addAbility(ability.withFlavorWord("Cheer"));
diff --git a/Mage/src/main/java/mage/abilities/common/OneOrMoreCombatDamagePlayerTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/OneOrMoreCombatDamagePlayerTriggeredAbility.java
index ec79d7e82c2..2a30bf01948 100644
--- a/Mage/src/main/java/mage/abilities/common/OneOrMoreCombatDamagePlayerTriggeredAbility.java
+++ b/Mage/src/main/java/mage/abilities/common/OneOrMoreCombatDamagePlayerTriggeredAbility.java
@@ -3,8 +3,8 @@ package mage.abilities.common;
 import mage.abilities.effects.Effect;
 import mage.constants.SetTargetPointer;
 import mage.constants.Zone;
+import mage.filter.FilterPermanent;
 import mage.filter.StaticFilters;
-import mage.filter.common.FilterCreaturePermanent;
 
 /**
  * @author Xanderhall, xenohedron
@@ -15,19 +15,19 @@ public class OneOrMoreCombatDamagePlayerTriggeredAbility extends OneOrMoreDamage
         this(effect, SetTargetPointer.NONE);
     }
 
-    public OneOrMoreCombatDamagePlayerTriggeredAbility(Effect effect, FilterCreaturePermanent filter) {
+    public OneOrMoreCombatDamagePlayerTriggeredAbility(Effect effect, FilterPermanent filter) {
         this(Zone.BATTLEFIELD, effect, filter, SetTargetPointer.NONE, false);
     }
 
     public OneOrMoreCombatDamagePlayerTriggeredAbility(Effect effect, SetTargetPointer setTargetPointer) {
-        this(effect, setTargetPointer, false);
+        this(effect, setTargetPointer, StaticFilters.FILTER_PERMANENT_CREATURES, false);
     }
 
-    public OneOrMoreCombatDamagePlayerTriggeredAbility(Effect effect, SetTargetPointer setTargetPointer, boolean optional) {
-        this(Zone.BATTLEFIELD, effect, StaticFilters.FILTER_PERMANENT_CREATURES, setTargetPointer, optional);
+    public OneOrMoreCombatDamagePlayerTriggeredAbility(Effect effect, SetTargetPointer setTargetPointer, FilterPermanent filter, boolean optional) {
+        this(Zone.BATTLEFIELD, effect, filter, setTargetPointer, optional);
     }
 
-    public OneOrMoreCombatDamagePlayerTriggeredAbility(Zone zone, Effect effect, FilterCreaturePermanent filter,
+    public OneOrMoreCombatDamagePlayerTriggeredAbility(Zone zone, Effect effect, FilterPermanent filter,
                                                        SetTargetPointer setTargetPointer, boolean optional) {
         super(zone, effect, filter, true, true, setTargetPointer, optional);
     }