diff --git a/projects/mtg/bin/Res/sets/POR/_cards.dat b/projects/mtg/bin/Res/sets/POR/_cards.dat
index 01ef175e7..75bca03cb 100644
--- a/projects/mtg/bin/Res/sets/POR/_cards.dat
+++ b/projects/mtg/bin/Res/sets/POR/_cards.dat
@@ -275,7 +275,7 @@ auto=moveTo(myHand)
 id=4259
 name=Deja vu
 rarity=C
-mana={2}{B}
+mana={2}{U}
 type=Sorcery
 [/card]
 [card]
diff --git a/projects/mtg/bin/Res/test/_tests.txt b/projects/mtg/bin/Res/test/_tests.txt
index 5e45b5fef..50972c6ec 100644
--- a/projects/mtg/bin/Res/test/_tests.txt
+++ b/projects/mtg/bin/Res/test/_tests.txt
@@ -40,10 +40,12 @@ counsel_of_the_soratami.txt
 counterspell.txt
 counterspell2.txt
 creature_bond.txt
+deja_vu.txt
 dingus_egg.txt
 doomed_necromancer.txt
 dragon_fodder.txt
 drain_life.txt
+elvish_piper.txt
 fastbond.txt
 flare.txt
 foratog.txt
diff --git a/projects/mtg/bin/Res/test/deja_vu.txt b/projects/mtg/bin/Res/test/deja_vu.txt
new file mode 100644
index 000000000..0c16d8a5c
--- /dev/null
+++ b/projects/mtg/bin/Res/test/deja_vu.txt
@@ -0,0 +1,20 @@
+# Deja Vu Return target sorcery card from your graveyard to your hand.
+#bug: is not a sorcery when it resolves, instead it is shown as "Error"
+[INIT]
+FIRSTMAIN
+[PLAYER1]
+hand:deja vu
+graveyard:fireball
+manapool:{2}{U}
+[PLAYER2]
+[DO]
+deja vu
+fireball
+[ASSERT]
+FIRSTMAIN
+[PLAYER1]
+hand:fireball
+graveyard:deja vu
+manapool:{0}
+[PLAYER2]
+[END]
\ No newline at end of file
diff --git a/projects/mtg/bin/Res/test/elvish_piper.txt b/projects/mtg/bin/Res/test/elvish_piper.txt
new file mode 100644
index 000000000..01d6e059b
--- /dev/null
+++ b/projects/mtg/bin/Res/test/elvish_piper.txt
@@ -0,0 +1,18 @@
+# {G},{T}: You may put a creature card from your hand into play.
+[INIT]
+FIRSTMAIN
+[PLAYER1]
+hand:grizzly bears
+inplay:elvish piper
+manapool:{G}
+[PLAYER2]
+[DO]
+elvish piper
+grizzly bears
+[ASSERT]
+FIRSTMAIN
+[PLAYER1]
+inplay:elvish piper,grizzly bears
+manapool:{0}
+[PLAYER2]
+[END]
\ No newline at end of file
diff --git a/projects/mtg/include/GameStateDeckViewer.h b/projects/mtg/include/GameStateDeckViewer.h
index 28b8cf2db..0487ae96b 100644
--- a/projects/mtg/include/GameStateDeckViewer.h
+++ b/projects/mtg/include/GameStateDeckViewer.h
@@ -267,7 +267,7 @@ class GameStateDeckViewer: public GameState, public JGuiListener
   int Remove(MTGCard * card){
     if (!card) return 0;
     int result = displayed_deck->Remove(card);
-    loadIndexes(currentCard);
+    //loadIndexes(currentCard);
     return result;
   }
 
@@ -326,7 +326,7 @@ class GameStateDeckViewer: public GameState, public JGuiListener
 	  char buffer[4096];
 	  {
 	    MTGCard * card  = cardIndex[2];
-	    if (card){
+	    if (card && displayed_deck->cards[card]){
 	      int rnd = (rand() % 20);
 	      price = pricelist->getPrice(card->getMTGId()) / 2;
 	      price = price - price * (rnd -10)/100;
@@ -777,8 +777,8 @@ class GameStateDeckViewer: public GameState, public JGuiListener
 	  MTGCard * card  = cardIndex[2];
 	  if (card){
 	    int rnd = (rand() % 20);
-	    price = price - (rnd * price)/100;
 	    playerdata->credits += price;
+      price = price - (rnd * price)/100;
 	    pricelist->setPrice(card->getMTGId(),price*2);
 #if defined (WIN32) || defined (LINUX)
 	    char buf[4096];