diff --git a/projects/mtg/src/AllAbilities.cpp b/projects/mtg/src/AllAbilities.cpp
index ff417242b..386d77396 100644
--- a/projects/mtg/src/AllAbilities.cpp
+++ b/projects/mtg/src/AllAbilities.cpp
@@ -3936,7 +3936,12 @@ int AACloner::resolve()
             spell->source->addType(*it);
         }
         spell->source->modifiedbAbi = _target->modifiedbAbi;
-        spell->source->basicAbilities = _target->origbasicAbilities;
+        //spell->source->basicAbilities = _target->origbasicAbilities;
+        for(int k = 0; k < Constants::NB_BASIC_ABILITIES; k++)
+        {
+            if(_target->model->data->basicAbilities[k])
+               spell->source->basicAbilities[k] = _target->model->data->basicAbilities[k];
+        }
         delete spell;
     }
     return 1;
diff --git a/projects/mtg/src/MTGGameZones.cpp b/projects/mtg/src/MTGGameZones.cpp
index 039f43070..3accbde01 100644
--- a/projects/mtg/src/MTGGameZones.cpp
+++ b/projects/mtg/src/MTGGameZones.cpp
@@ -435,7 +435,7 @@ MTGCardInstance * MTGPlayerCards::putInZone(MTGCardInstance * card, MTGGameZone
     if (from == g->players[0]->game->battlefield || from == g->players[1]->game->battlefield)
     {
         if(to != g->players[0]->game->battlefield || to != g->players[1]->game->battlefield)
-        if (copy->previous && copy->previous->MeldedFrom.size())
+        if (copy->previous && copy->previous->MeldedFrom.size() && !copy->isACopier && !copy->isToken)//!copier & !token fix kiki-jiki clones crash
         {
             vector<string> names = split(copy->previous->MeldedFrom, '|');
             MTGCard * cardone = MTGCollection()->getCardByName(names[0]);