diff --git a/res/cardsfolder/counterbalance.txt b/res/cardsfolder/counterbalance.txt
index 976bebdde6f..157b53aa7b2 100644
--- a/res/cardsfolder/counterbalance.txt
+++ b/res/cardsfolder/counterbalance.txt
@@ -1,8 +1,11 @@
 Name:Counterbalance
 ManaCost:U U
 Types:Enchantment
-Text:Whenever an opponent plays a spell, you may reveal the top card of your library. If you do, counter that spell if it has the same converted mana cost as the revealed card.
-SVar:RemAIDeck:True
+Text:no text
+T:Mode$ SpellCast | ValidCard$ Card | ValidActivatingPlayer$ Opponent | OptionalDecider$ You | TriggerZones$ Battlefield | Execute$ TrigReveal | TriggerDescription$ Whenever an opponent casts a spell, you may reveal the top card of your library. If you do, counter that spell if it has the same converted mana cost as the revealed card.
+SVar:TrigReveal:AB$Dig | Cost$ 0 | DigNum$ 1 | Reveal$ True | DestinationZone$ Library | LibraryPosition$ 0 | LibraryPosition2$ 0 | SubAbility$ SVar=DBCounter
+SVar:DBCounter:DB$Counter | Cost$ 0 | Defined$ TriggeredSpellAbility | ConditionPresent$ Card.cmcEQX | ConditionDefined$ TriggeredCard | ConditionCompare$ GE1
+SVar:X:Count$TopOfLibraryCMC
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/counterbalance.jpg
 SetInfo:CSP|Uncommon|http://magiccards.info/scans/en/cs/31.jpg
diff --git a/res/cardsfolder/offalsnout.txt b/res/cardsfolder/offalsnout.txt
index 1167c60bf9d..058ced4baea 100644
--- a/res/cardsfolder/offalsnout.txt
+++ b/res/cardsfolder/offalsnout.txt
@@ -9,6 +9,7 @@ SVar:TrigExile:AB$ChangeZone | Cost$ 0 | Origin$ Graveyard | Destination$ Exile
 K:Evoke:B
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self+evoked | Execute$ TrigSac | Secondary$ True | TriggerDescription$ When CARDNAME enters the battlefield, if you cast it by it's evoke cost, sacrifice it.
 SVar:TrigSac:AB$Sacrifice | Cost$ 0
+SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/offalsnout.jpg
 SetInfo:MOR|Uncommon|http://magiccards.info/scans/en/mt/71.jpg
diff --git a/src/forge/Card.java b/src/forge/Card.java
index b2cb66ed3d7..d83771d5f78 100644
--- a/src/forge/Card.java
+++ b/src/forge/Card.java
@@ -2909,14 +2909,9 @@ public class Card extends MyObservable {
 	         	
 	         	if (Property.substring(z).equals("X")) {
 	         		x = CardFactoryUtil.xCount(source, source.getSVar("X"));
-	         	}
-	         	else
-	         		x = Integer.parseInt(Property.substring(z));
-	         	
-	         	if (Property.substring(z).equals("Y")) {
+	         	} else if (Property.substring(z).equals("Y")) {
 	         		x = CardFactoryUtil.xCount(source, source.getSVar("Y"));
-	         	}
-	         	else
+	         	} else
 	         		x = Integer.parseInt(Property.substring(z));
 	         	
 	         	if (!compare(y, Property, x))