diff --git a/projects/mtg/src/AIPlayer.cpp b/projects/mtg/src/AIPlayer.cpp
index 760099678..2f91ed17c 100644
--- a/projects/mtg/src/AIPlayer.cpp
+++ b/projects/mtg/src/AIPlayer.cpp
@@ -1256,8 +1256,8 @@ AIPlayer * AIPlayerFactory::createAIPlayer(MTGAllCards * collection, Player * op
         while(tempDeckId > 100)
         {
             tempDeckId -= 100;
-            avatarId = tempDeckId;
         }
+        avatarId = tempDeckId;
         sprintf(avatarFile, "avatar%i.jpg", avatarId);
         sprintf(deckFileSmall, "ai_baka_deck%i", deckid);
     }
diff --git a/projects/mtg/src/DeckMetaData.cpp b/projects/mtg/src/DeckMetaData.cpp
index de8a4cb8b..975b2b965 100644
--- a/projects/mtg/src/DeckMetaData.cpp
+++ b/projects/mtg/src/DeckMetaData.cpp
@@ -77,8 +77,8 @@ int DeckMetaData::getAvatarId()
     while(tempDeckId > 100)
     {
         tempDeckId -= 100;
-        avatarId = tempDeckId;
     }
+    avatarId = tempDeckId;
     return avatarId;
 }