diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/ForbiddenOrchard.java b/Mage.Sets/src/mage/sets/championsofkamigawa/ForbiddenOrchard.java
index c402e47c07d..9135c48bed3 100644
--- a/Mage.Sets/src/mage/sets/championsofkamigawa/ForbiddenOrchard.java
+++ b/Mage.Sets/src/mage/sets/championsofkamigawa/ForbiddenOrchard.java
@@ -51,8 +51,10 @@ public class ForbiddenOrchard extends CardImpl {
     public ForbiddenOrchard (UUID ownerId) {
         super(ownerId, 276, "Forbidden Orchard", Rarity.RARE, new CardType[]{CardType.LAND}, null);
         this.expansionSetCode = "CHK";
+        
         // {T}: Add one mana of any color to your mana pool.
         this.addAbility(new AnyColorManaAbility());
+        
         // Whenever you tap Forbidden Orchard for mana, put a 1/1 colorless Spirit creature token onto the battlefield under target opponent's control.
         this.addAbility(new ForbiddenOrchardTriggeredAbility());
     }
@@ -78,12 +80,14 @@ class ForbiddenOrchardTriggeredAbility extends TriggeredAbilityImpl {
         super(ability);
     }
 
+    @Override
+    public boolean checkEventType(GameEvent event, Game game) {
+        return event.getType() == GameEvent.EventType.TAPPED_FOR_MANA;
+    }
+    
     @Override
     public boolean checkTrigger(GameEvent event, Game game) {
-        if (event.getType() == GameEvent.EventType.TAPPED_FOR_MANA && event.getSourceId().equals(getSourceId())) {
-            return true;
-        }
-        return false;
+        return event.getSourceId().equals(getSourceId());
     }
 
     @Override
diff --git a/Mage/src/mage/abilities/AbilityImpl.java b/Mage/src/mage/abilities/AbilityImpl.java
index b672033250a..c3af738254f 100644
--- a/Mage/src/mage/abilities/AbilityImpl.java
+++ b/Mage/src/mage/abilities/AbilityImpl.java
@@ -376,7 +376,7 @@ public abstract class AbilityImpl implements Ability {
                     } else if (effect instanceof DynamicManaEffect) {
                         mana = ((DynamicManaEffect)effect).getMana(game, this);
                     }
-                    if (mana != null) { // if mana == null the event has to be fired in the mana effect
+                    if (mana != null && mana.getAny() == 0) { // if mana == null or Any > 0 the event has to be fired in the mana effect to know which mana was produced
                         ManaEvent event = new ManaEvent(GameEvent.EventType.TAPPED_FOR_MANA, sourceId, sourceId, controllerId, mana);
                         if (!game.replaceEvent(event)) {
                             game.fireEvent(event);