diff --git a/.gitattributes b/.gitattributes
index d22a4cb381f..e522bda76c7 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2652,6 +2652,7 @@ res/cardsfolder/krosan_restorer.txt -text svneol=native#text/plain
 res/cardsfolder/krosan_war_chief.txt -text svneol=native#text/plain
 res/cardsfolder/krovikan_elementalist.txt -text svneol=native#text/plain
 res/cardsfolder/krovikan_horror.txt -text svneol=native#text/plain
+res/cardsfolder/krovikan_mist.txt -text svneol=native#text/plain
 res/cardsfolder/krovikan_rot.txt -text svneol=native#text/plain
 res/cardsfolder/krovikan_scoundrel.txt -text svneol=native#text/plain
 res/cardsfolder/kuldotha_forgemaster.txt -text svneol=native#text/plain
@@ -3178,6 +3179,7 @@ res/cardsfolder/mythic_proportions.txt -text svneol=native#text/plain
 res/cardsfolder/nacatl_outlander.txt -text svneol=native#text/plain
 res/cardsfolder/nacatl_savage.txt -text svneol=native#text/plain
 res/cardsfolder/nameless_inversion.txt -text svneol=native#text/plain
+res/cardsfolder/nameless_one.txt -text svneol=native#text/plain
 res/cardsfolder/nameless_race.txt -text svneol=native#text/plain
 res/cardsfolder/nantuko_blightcutter.txt -text svneol=native#text/plain
 res/cardsfolder/nantuko_calmer.txt -text svneol=native#text/plain
diff --git a/res/cardsfolder/drift_of_the_dead.txt b/res/cardsfolder/drift_of_the_dead.txt
index 374e0a7ee63..24d5bda4b26 100644
--- a/res/cardsfolder/drift_of_the_dead.txt
+++ b/res/cardsfolder/drift_of_the_dead.txt
@@ -2,10 +2,9 @@ Name:Drift of the Dead
 ManaCost:3 B
 Types:Creature Wall
 Text:no text
-PT:0/0
+PT:*/*
 K:Defender
-K:stPumpSelf:Creature:X/X:Creature+Self:Drift of the Dead's power and toughness are each equal to the number of snow lands you control.
-SVar:X:Count$Valid Land.Snow+YouCtrl
+K:stSetPT:Count$Valid Land.Snow+YouCtrl:Count$Valid Land.Snow+YouCtrl:Drift of the Dead's power and toughness are each equal to the number of snow lands you control.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/drift_of_the_dead.jpg
 SetInfo:ICE|Uncommon|http://magiccards.info/scans/en/ia/11.jpg
diff --git a/res/cardsfolder/krovikan_mist.txt b/res/cardsfolder/krovikan_mist.txt
new file mode 100644
index 00000000000..ba68e3b5278
--- /dev/null
+++ b/res/cardsfolder/krovikan_mist.txt
@@ -0,0 +1,10 @@
+Name:Krovikan Mist
+ManaCost:1 U
+Types:Creature Illusion
+Text:no text
+PT:*/*
+K:Flying
+K:stSetPT:Count$Valid Illusion:Count$Valid Illusion:Krovikan Mist's power and toughness are each equal to the number of Illusions on the battlefield.
+SVar:Rarity:Common
+SVar:Picture:http://www.wizards.com/global/images/magic/general/krovikan_mist.jpg
+End
\ No newline at end of file
diff --git a/res/cardsfolder/nameless_one.txt b/res/cardsfolder/nameless_one.txt
new file mode 100644
index 00000000000..908ad9e10b7
--- /dev/null
+++ b/res/cardsfolder/nameless_one.txt
@@ -0,0 +1,10 @@
+Name:Nameless One
+ManaCost:3 U
+Types:Creature Wizard Avatar
+Text:no text
+PT:*/*
+K:stSetPT:Count$Valid Illusion:Count$Valid Illusion:Nameless One's power and toughness are each equal to the number of Wizards on the battlefield.
+K:Morph:2 U
+SVar:Rarity:Uncommon
+SVar:Picture:http://www.wizards.com/global/images/magic/general/nameless_one.jpg
+End
\ No newline at end of file
diff --git a/src/forge/CardFactoryUtil.java b/src/forge/CardFactoryUtil.java
index 346f5d561c2..ef69a6a67a7 100644
--- a/src/forge/CardFactoryUtil.java
+++ b/src/forge/CardFactoryUtil.java
@@ -3545,7 +3545,8 @@ public class CardFactoryUtil {
         
         // count valid cards on the battlefield
         if(l[0].contains("Valid")) {
-        	final String restrictions = l[0].replace("Valid ", "");
+        	String restrictions = l[0].replace("Valid ", "");
+        	restrictions = restrictions.replace("Count$", "");
         	final String rest[] = restrictions.split(",");
         	CardList cardsonbattlefield = new CardList();
         	cardsonbattlefield.addAll(myField.getCards());