diff --git a/res/cardsfolder/s/safe_passage.txt b/res/cardsfolder/s/safe_passage.txt
index 746a474f0e4..e8ea75aadd7 100644
--- a/res/cardsfolder/s/safe_passage.txt
+++ b/res/cardsfolder/s/safe_passage.txt
@@ -2,9 +2,8 @@ Name:Safe Passage
 ManaCost:2 W
 Types:Instant
 Text:no text
-A:SP$ Effect | Cost$ 2 W | Name$ Safe Passage Effect | StaticAbilities$ CPump,PPump | SpellDescription$ Prevent all damage that would be dealt to you and creatures you control this turn.
-SVar:CPump:Mode$ Continuous | Affected$ Creature.YouCtrl | AddHiddenKeyword$ HIDDEN Prevent all damage that would be dealt to CARDNAME. | Description$ Prevent all damage that would be dealt to you and creatures you control this turn.
-SVar:PPump:Mode$ Continuous | Affected$ You | AddKeyword$ Prevent all damage that would be dealt to you
+A:SP$ Effect | Cost$ 2 W | Name$ Safe Passage Effect | StaticAbilities$ STPrevent | SpellDescription$ Prevent all damage that would be dealt to you and creatures you control this turn.
+SVar:STPrevent:Mode$ PreventDamage | Target$ You,Creature.YouCtrl | Description$ Prevent all damage that would be dealt to you and creatures you control this turn.
 SVar:RemAIDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/safe_passage.jpg
diff --git a/src/main/java/forge/Player.java b/src/main/java/forge/Player.java
index 87a6842f1f0..704bbf99184 100644
--- a/src/main/java/forge/Player.java
+++ b/src/main/java/forge/Player.java
@@ -404,10 +404,6 @@ public abstract class Player extends GameEntity {
         if (source.hasKeyword("Prevent all damage that would be dealt to and dealt by CARDNAME.")) return 0;
         if (source.hasKeyword("Prevent all damage that would be dealt by CARDNAME.")) return 0;
         if (AllZoneUtil.isCardInPlay("Purity", this) && !isCombat) return 0;
-        
-        if (hasKeyword("Prevent all damage that would be dealt to you")) {
-            return 0;
-        }
 
         //Prevent Damage static abilities
         CardList allp = AllZoneUtil.getCardsIn(Zone.Battlefield);