diff --git a/res/cards.txt b/res/cards.txt
index aa11a8d6780..f8ed40220ec 100644
--- a/res/cards.txt
+++ b/res/cards.txt
@@ -1,3 +1,9 @@
+Final Judgment
+4 W W
+Sorcery
+Exile all creatures.
+spBounceAll:Creature:Exile
+
 Upheaval
 4 U U
 Sorcery
@@ -15,7 +21,7 @@ Inundate
 3 U U U
 Sorcery
 Return all nonblue creatures to their owners' hands.
-spBounceAll:Permanent.nonBlue:Hand
+spBounceAll:Creature.nonBlue:Hand
 
 Reduce to Dreams
 3 U U
diff --git a/src/forge/CardFactory.java b/src/forge/CardFactory.java
index bd61a136598..fb788844a2b 100644
--- a/src/forge/CardFactory.java
+++ b/src/forge/CardFactory.java
@@ -2816,17 +2816,18 @@ public class CardFactory implements NewConstants {
                     
                     for(int i = 0; i < all.size(); i++) {
                         Card c = all.get(i);
-                        	if(c.isToken()) AllZone.getZone(c).remove(c);
-                        	else {  if(Destination.equals("TopofLibrary")) AllZone.GameAction.moveToTopOfLibrary(c);
+                        if(c.isToken()) AllZone.getZone(c).remove(c);
+                        else {  
+					if(Destination.equals("TopofLibrary")) AllZone.GameAction.moveToTopOfLibrary(c);
 					else if(Destination.equals("ShuffleIntoLibrary")) {
 							AllZone.GameAction.moveToTopOfLibrary(c);
 							AllZone.GameAction.shuffle(c.getOwner());
-					}
+						}
 					else if(Destination.equals("Exile")) AllZone.GameAction.removeFromGame(c); 
 					else if(Destination.equals("Hand")) {
                             			PlayerZone hand = AllZone.getZone(Constant.Zone.Hand, c.getOwner());
                            	 		AllZone.GameAction.moveTo(hand, c);
-					}
+						}
 				}
                     }
                 }// resolve()