diff --git a/projects/mtg/src/Credits.cpp b/projects/mtg/src/Credits.cpp
index 811c62ade..d50cc0fe4 100644
--- a/projects/mtg/src/Credits.cpp
+++ b/projects/mtg/src/Credits.cpp
@@ -40,6 +40,7 @@ void Credits::compute(Player * _p1, Player * _p2, GameApp * _app){
   app = _app;
   showMsg = (rand() % 5);
   GameObserver * g = GameObserver::GetInstance();
+  if (!g->turn) return;
   if (!p1->isAI() && p2->isAI() && p1!= g->gameOver){
     value = 400;
     if (app->gameType != GAME_TYPE_CLASSIC) value = 200;
@@ -144,29 +145,32 @@ void Credits::Render(){
   f2->SetScale(1);
   f3->SetScale(1);
   char buffer[512];
-  if (!p1->isAI() && p2->isAI() ){
-    if (g->gameOver != p1){
-      sprintf (buffer, _("Congratulations! You earn %i credits").c_str(), value);
-      if (unlockedQuad){
-        showMsg = 0;
-        r->RenderQuad(unlockedQuad, 20, 20);
-      }
-      if(unlockedString.size()){
-        f2->DrawString(unlockedString.c_str(),SCREEN_WIDTH/2, 80,JGETEXT_CENTER);
+  if (!g->turn){
+    sprintf(buffer, _("Please check your deck (not enough cards?)").c_str() );
+  }else{
+    if (!p1->isAI() && p2->isAI() ){
+      if (g->gameOver != p1){
+        sprintf (buffer, _("Congratulations! You earn %i credits").c_str(), value);
+        if (unlockedQuad){
+          showMsg = 0;
+          r->RenderQuad(unlockedQuad, 20, 20);
+        }
+        if(unlockedString.size()){
+          f2->DrawString(unlockedString.c_str(),SCREEN_WIDTH/2, 80,JGETEXT_CENTER);
+        }
+      }else{
+        sprintf (buffer, _("You have been defeated").c_str());
       }
     }else{
-      sprintf (buffer, _("You have been defeated").c_str());
+      int winner = 2;
+      if (g->gameOver !=p1){
+        winner = 1;
+      }
+      int p0life = p1->life;
+      sprintf(buffer, _("Player %i wins (%i)").c_str(), winner, p0life );
     }
-  }else{
-    int winner = 2;
-    if (g->gameOver !=p1){
-      winner = 1;
-    }
-    int p0life = p1->life;
-    sprintf(buffer, _("Player %i wins (%i)").c_str(), winner, p0life );
   }
 
-
   float y = 130;
   if (showMsg == 1) y = 50;
   vector<CreditBonus *>:: iterator it;
diff --git a/projects/mtg/src/PhaseRing.cpp b/projects/mtg/src/PhaseRing.cpp
index 336803aa4..0aba3ef99 100644
--- a/projects/mtg/src/PhaseRing.cpp
+++ b/projects/mtg/src/PhaseRing.cpp
@@ -24,15 +24,17 @@ PhaseRing::~PhaseRing(){
   }
 }
 
-//This needs to be controlled either by GameObserver or PhaseRing in the future
+//Tells if next phase will be another Damage phase rather than combat ends
 bool PhaseRing::extraDamagePhase(int id){
   GameObserver * g = GameObserver::GetInstance();
   if (id != Constants::MTG_PHASE_COMBATEND) return false;
   if (g->combatStep != END_FIRST_STRIKE) return false;
-  MTGGameZone * z = g->currentPlayer->game->inPlay;
-  for (int i= 0; i < z->nb_cards; ++i){
-    MTGCardInstance * card = z->cards[i];
-    if (card->isAttacker() && !(card->has(Constants::FIRSTSTRIKE) || card->has(Constants::DOUBLESTRIKE))) return true;
+  for (int j = 0; j < 2; ++j){
+    MTGGameZone * z = g->players[j]->game->inPlay;
+    for (int i= 0; i < z->nb_cards; ++i){
+      MTGCardInstance * card = z->cards[i];
+      if ((card->isAttacker() || card->isDefenser()) && !(card->has(Constants::FIRSTSTRIKE) || card->has(Constants::DOUBLESTRIKE))) return true;
+    }
   }
   return false;
 }