diff --git a/projects/mtg/bin/Res/sets/MIR/_cards.dat b/projects/mtg/bin/Res/sets/MIR/_cards.dat
index ddb064063..ec3848216 100644
--- a/projects/mtg/bin/Res/sets/MIR/_cards.dat
+++ b/projects/mtg/bin/Res/sets/MIR/_cards.dat
@@ -358,13 +358,9 @@ mana={1}{W}
 type=Instant
 [/card]
 [card]
-text=Spend only black mana on X.   Drain Life deals X damage to target creature or player. You gain life equal to the damage dealt, but not more life than the player's life total before Drain Life dealt damage or the creature's toughness.
 id=3287
-alias=1156
-name=Drain Life
+primitive=Drain Life
 rarity=C
-mana={X}{1}{B}
-type=Sorcery
 [/card]
 [card]
 text={2}{R}, {T}: Destroy target nonbasic land.
diff --git a/projects/mtg/bin/Res/sets/RV/_cards.dat b/projects/mtg/bin/Res/sets/RV/_cards.dat
index aea002092..48e6beb25 100644
--- a/projects/mtg/bin/Res/sets/RV/_cards.dat
+++ b/projects/mtg/bin/Res/sets/RV/_cards.dat
@@ -583,13 +583,9 @@ toughness=3
 abilities=flying
 [/card]
 [card]
-text=Spend only black mana on X.   Drain Life deals X damage to target creature or player. You gain life equal to the damage dealt, but not more life than the player's life total before Drain Life dealt damage or the creature's toughness.
-target=player,creature
 id=1156
-name=Drain Life
+primitive=Drain Life
 rarity=C
-mana={X}{1}{B}
-type=Sorcery
 [/card]
 [card]
 text={B}: Regenerate Drudge Skeletons. (The next time this creature would be destroyed this turn, it isn't. Instead tap it, remove all damage from it, and remove it from combat.)
diff --git a/projects/mtg/bin/Res/sets/primitives/mtg.txt b/projects/mtg/bin/Res/sets/primitives/mtg.txt
index 740b1951c..bbf6758a2 100644
--- a/projects/mtg/bin/Res/sets/primitives/mtg.txt
+++ b/projects/mtg/bin/Res/sets/primitives/mtg.txt
@@ -1,6 +1,14 @@
 #Primitives Pack for Wagic the Homebrew.
 #Please keep these card alphabetized, and try to have the "name=" line at the top of each card
 [card]
+text=Spend only black mana on X.   Drain Life deals X damage to target creature or player. You gain life equal to the damage dealt, but not more life than the player's life total before Drain Life dealt damage or the creature's toughness.
+target=creature,player
+alias=1156
+name=Drain Life
+mana={X}{1}{B}
+type=Sorcery
+[/card]
+[card]
 name=Forest
 text={T}: Add {G} to your mana pool.
 auto={T}: Add {G}
diff --git a/projects/mtg/src/MTGGameZones.cpp b/projects/mtg/src/MTGGameZones.cpp
index e273dcb3c..06b13eaf4 100644
--- a/projects/mtg/src/MTGGameZones.cpp
+++ b/projects/mtg/src/MTGGameZones.cpp
@@ -354,6 +354,7 @@ void MTGInPlay::untapAll(){
 //--------------------------
 void MTGLibrary::shuffleTopToBottom(int nbcards){
   if (nbcards>nb_cards) nbcards = nb_cards;
+  if (nbcards < 0) return;
   MTGCardInstance * _cards[MTG_MAX_PLAYER_CARDS];
   for (int i= nb_cards-nbcards; i<(nb_cards); i++) {
     int r = i + (WRand() % (nbcards-i)); // Random remaining position.