diff --git a/projects/mtg/src/CardGui.cpp b/projects/mtg/src/CardGui.cpp
index 405edab77..a114df329 100644
--- a/projects/mtg/src/CardGui.cpp
+++ b/projects/mtg/src/CardGui.cpp
@@ -310,7 +310,7 @@ void CardGui::Render()
     if(!card->isToken && card->isACopier)
         buff = "C";    
 
-    if(!alternate && buff != "")
+	if(!alternate && buff != "" && game->gameType() == GAME_TYPE_CLASSIC)//it seems that other game modes makes cards as tokens!!! hmmm...
 	{
         mFont->SetScale(DEFAULT_MAIN_FONT_SCALE);
         char buffer[200];
diff --git a/projects/mtg/src/DeckMenu.cpp b/projects/mtg/src/DeckMenu.cpp
index 9c544a535..d1c0adef2 100644
--- a/projects/mtg/src/DeckMenu.cpp
+++ b/projects/mtg/src/DeckMenu.cpp
@@ -215,10 +215,7 @@ void DeckMenu::selectRandomDeck(bool isAi)
 {
     DeckManager *deckManager = DeckManager::GetInstance();
     vector<DeckMetaData *> *deckList = isAi ? deckManager->getAIDeckOrderList() : deckManager->getPlayerDeckOrderList();
-    //int random = (WRand() * 1000) % deckList->size();
-    int lowest=0, highest = deckList->size();
-    int range=(highest-lowest);
-    int random = lowest+int(range*rand()/(RAND_MAX + 1.0));
+    int random = rand() % (int)deckList->size();
     selectDeck( random, isAi );
 }
 
diff --git a/projects/mtg/src/GameStateDuel.cpp b/projects/mtg/src/GameStateDuel.cpp
index 2d902c8b8..2af6be905 100644
--- a/projects/mtg/src/GameStateDuel.cpp
+++ b/projects/mtg/src/GameStateDuel.cpp
@@ -1857,9 +1857,7 @@ int Tournament::getRandomDeck(bool noEasyDecks)
     while(isDouble && decks.size()>0)
     {
         isDouble=false;
-        int lowest=0, highest = (int)decks.size();
-        int range=(highest-lowest);
-        k = lowest+int(range*rand()/(RAND_MAX + 1.0));
+        k = rand() % (int)decks.size();
         random = decks.at(k);
 
         deckNumber = deckList->at(random)->getDeckId();