diff --git a/Mage.Sets/src/mage/cards/t/TheCabbageMerchant.java b/Mage.Sets/src/mage/cards/t/TheCabbageMerchant.java
index d79315922f4..afdf6cfa761 100644
--- a/Mage.Sets/src/mage/cards/t/TheCabbageMerchant.java
+++ b/Mage.Sets/src/mage/cards/t/TheCabbageMerchant.java
@@ -12,9 +12,11 @@ import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.SubType;
 import mage.constants.SuperType;
+import mage.filter.FilterPermanent;
 import mage.filter.StaticFilters;
 import mage.filter.common.FilterControlledPermanent;
 import mage.filter.predicate.permanent.TappedPredicate;
+import mage.filter.predicate.permanent.TokenPredicate;
 import mage.game.permanent.token.FoodToken;
 import mage.target.common.TargetControlledPermanent;
 
@@ -27,9 +29,11 @@ public final class TheCabbageMerchant extends CardImpl {
 
     private static final FilterControlledPermanent filter
             = new FilterControlledPermanent(SubType.FOOD, "untapped Foods you control");
+    private static final FilterPermanent filter2 = new FilterControlledPermanent(SubType.FOOD, "Food token");
 
     static {
         filter.add(TappedPredicate.UNTAPPED);
+        filter2.add(TokenPredicate.TRUE);
     }
 
     public TheCabbageMerchant(UUID ownerId, CardSetInfo setInfo) {
@@ -43,13 +47,13 @@ public final class TheCabbageMerchant extends CardImpl {
 
         // Whenever an opponent casts a noncreature spell, create a Food token.
         this.addAbility(new SpellCastOpponentTriggeredAbility(
-                new CreateTokenEffect(new FoodToken()), StaticFilters.FILTER_SPELL_NON_CREATURE, false
+                new CreateTokenEffect(new FoodToken()), StaticFilters.FILTER_SPELL_A_NON_CREATURE, false
         ));
 
         // Whenever a creature deals combat damage to you, sacrifice a Food token.
         this.addAbility(new DealsDamageToYouAllTriggeredAbility(
                 StaticFilters.FILTER_PERMANENT_CREATURE,
-                new SacrificeControllerEffect(StaticFilters.FILTER_CONTROLLED_FOOD, 1, ""), true
+                new SacrificeControllerEffect(filter2, 1, ""), true
         ));
 
         // Tap two untapped Foods you control: Add one mana of any color.