diff --git a/res/cardsfolder/judge_of_currents.txt b/res/cardsfolder/judge_of_currents.txt
index 0b8537a28e6..1a23229a003 100644
--- a/res/cardsfolder/judge_of_currents.txt
+++ b/res/cardsfolder/judge_of_currents.txt
@@ -3,6 +3,8 @@ ManaCost:1 W
 Types:Creature Merfolk Wizard
 Text:no text
 PT:1/1
+#Note: Type/Creature.Merfolk is not accepted by WheneverKeyword
+#"Initiator - OwnedByController" causes one player not to trigger if both players have Judge of Currents in play
 K:WheneverKeyword:BecomesTapped:Type/Merfolk:Play:ModifyLife/1:ControllingPlayer_Self:ASAP:Yes_No:Initiator - OwnedByController:Whenever a Merfolk you control becomes tapped, you may gain 1 life.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/judge_of_currents.jpg
diff --git a/src/forge/ReadCard.java b/src/forge/ReadCard.java
index d4617af9ecc..43829ede2b1 100644
--- a/src/forge/ReadCard.java
+++ b/src/forge/ReadCard.java
@@ -91,7 +91,12 @@ public class ReadCard implements Runnable, NewConstants {
             String s = readLine();
             while (!s.equals("End"))
             {
-            	if (s.startsWith("Name:"))
+            	if (s.startsWith("#"))
+            	{
+            		//no need to do anything, this indicates a comment line
+            	}
+            	
+            	else if (s.startsWith("Name:"))
             	{
             		String t = s.substring(5);
             		//System.out.println(s);