diff --git a/Mage.Sets/src/mage/cards/f/FieldOfSouls.java b/Mage.Sets/src/mage/cards/f/FieldOfSouls.java
index 16dd2e04da1..682ac54ff26 100644
--- a/Mage.Sets/src/mage/cards/f/FieldOfSouls.java
+++ b/Mage.Sets/src/mage/cards/f/FieldOfSouls.java
@@ -1,8 +1,7 @@
-
 package mage.cards.f;
 
 import java.util.UUID;
-import mage.abilities.common.DiesCreatureTriggeredAbility;
+import mage.abilities.common.PutIntoGraveFromBattlefieldAllTriggeredAbility;
 import mage.abilities.effects.common.CreateTokenEffect;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
@@ -10,7 +9,7 @@ import mage.constants.CardType;
 import mage.constants.TargetController;
 import mage.filter.common.FilterCreaturePermanent;
 import mage.filter.predicate.Predicates;
-import mage.filter.predicate.other.OwnerPredicate;
+import mage.filter.predicate.permanent.ControllerPredicate;
 import mage.filter.predicate.permanent.TokenPredicate;
 import mage.game.permanent.token.SpiritWhiteToken;
 
@@ -19,18 +18,26 @@ import mage.game.permanent.token.SpiritWhiteToken;
  * @author fireshoes
  */
 public final class FieldOfSouls extends CardImpl {
-    
-    private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("nontoken creature");
-    static{
-        filter.add(new OwnerPredicate(TargetController.YOU));
+
+    private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("a nontoken creature");
+
+    static {
+        filter.add(new ControllerPredicate(TargetController.YOU));
         filter.add(Predicates.not(TokenPredicate.instance));
     }
 
     public FieldOfSouls(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{W}{W}");
+        super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{W}{W}");
 
         // Whenever a nontoken creature is put into your graveyard from the battlefield, create a 1/1 white Spirit creature token with flying.
-        this.addAbility(new DiesCreatureTriggeredAbility(new CreateTokenEffect(new SpiritWhiteToken()), false, filter));
+        this.addAbility(new PutIntoGraveFromBattlefieldAllTriggeredAbility(
+                new CreateTokenEffect(
+                        new SpiritWhiteToken()),
+                false,
+                filter,
+                false,
+                true));
+        
     }
 
     public FieldOfSouls(final FieldOfSouls card) {