diff --git a/res/cardsfolder/b/blazing_archon.txt b/res/cardsfolder/b/blazing_archon.txt
index 1c40b527c94..b2ac36fcc9a 100644
--- a/res/cardsfolder/b/blazing_archon.txt
+++ b/res/cardsfolder/b/blazing_archon.txt
@@ -1,9 +1,10 @@
 Name:Blazing Archon
 ManaCost:6 W W W
 Types:Creature Archon
-Text:Creatures can't attack you.
+Text:no text
 PT:5/6
 K:Flying
+S:Mode$ Continuous | Affected$ Creature.YouDontCtrl | AddHiddenKeyword$ HIDDEN CARDNAME can't attack. | Description$ Creatures can't attack you.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/blazing_archon.jpg
 SetInfo:RAV|Rare|http://magiccards.info/scans/en/rav/4.jpg
diff --git a/res/cardsfolder/p/peacekeeper.txt b/res/cardsfolder/p/peacekeeper.txt
index 2653b90d2eb..d31404cd6ae 100644
--- a/res/cardsfolder/p/peacekeeper.txt
+++ b/res/cardsfolder/p/peacekeeper.txt
@@ -1,9 +1,10 @@
 Name:Peacekeeper
 ManaCost:2 W
 Types:Creature Human
-Text:Creatures can't attack
+Text:no text
 PT:1/1
 K:At the beginning of your upkeep, sacrifice CARDNAME unless you pay 1 W
+S:Mode$ Continuous | Affected$ Creature | AddHiddenKeyword$ HIDDEN CARDNAME can't attack. | Description$ Creatures can't attack.
 SVar:RemAIDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/peacekeeper.jpg
diff --git a/src/main/java/forge/CombatUtil.java b/src/main/java/forge/CombatUtil.java
index 649aefc669b..1ac709e2108 100644
--- a/src/main/java/forge/CombatUtil.java
+++ b/src/main/java/forge/CombatUtil.java
@@ -478,8 +478,6 @@ public class CombatUtil {
     public static boolean canAttackNextTurn(Card c) {
         if (!c.isCreature()) return false;
 
-        if (AllZoneUtil.isCardInPlay("Peacekeeper")) return false;
-
         // CARDNAME can't attack if defending player controls an untapped creature with power ...
         final int powerLimit[] = {0};
         int keywordPosition = 0;
@@ -559,8 +557,7 @@ public class CombatUtil {
         //The creature won't untap next turn
         if (c.isTapped() && !PhaseUtil.canUntap(c)) return false;
 
-        if (AllZoneUtil.isCardInPlay("Blazing Archon", c.getController().getOpponent())
-                || c.hasKeyword("CARDNAME can't attack.")
+        if (c.hasKeyword("CARDNAME can't attack.")
                 || c.hasKeyword("CARDNAME can't attack or block.")
                 || (AllZoneUtil.isCardInPlay("Reverence", c.getController().getOpponent()) && c.getNetAttack() < 3))
             return false;