diff --git a/assets/data/abilities.js b/assets/data/abilities.js
index 1380b91..7b3f52c 100644
--- a/assets/data/abilities.js
+++ b/assets/data/abilities.js
@@ -43,6 +43,7 @@ module.exports = {
       if(!field.isOnField(card)){
         field.get().forEach(function(_card){
           if(_card.getID() == id) return;
+          if(_card.hasAbility("hero")) return;
           if(_card.getType() != card.getType()) return;
           _card.setBoost(id, 0);
         })
@@ -52,6 +53,7 @@ module.exports = {
 
       field.get().forEach(function(_card){
         if(_card.getID() == id) return;
+        if(_card.hasAbility("hero")) return;
         if(_card.getType() != card.getType()) return;
         _card.setBoost(id, 1);
       })
diff --git a/assets/data/cards.js b/assets/data/cards.js
index e1fc109..2a35c61 100644
--- a/assets/data/cards.js
+++ b/assets/data/cards.js
@@ -551,7 +551,7 @@ module.exports = {
   "kayran": {
     name: "Kayran",
     power: 8,
-    ability: ["hero", "morale_boost"],
+    ability: ["hero", "morale_boost", "agile"],
     img: "kayran",
     faction: "monster",
     type: 1
diff --git a/server/Battle.js b/server/Battle.js
index 11073bc..b07dcf6 100644
--- a/server/Battle.js
+++ b/server/Battle.js
@@ -64,6 +64,7 @@ var Battle = (function(){
     this.p1.draw(10);
     this.p2.draw(10);
 
+
    /* this.p1.hand.add(Card("impenetrable_fog"));
     this.p2.hand.add(Card("impenetrable_fog"));
     this.p1.hand.add(Card("biting_frost"));
diff --git a/server/Battleside.js b/server/Battleside.js
index 198b8e4..20abe46 100644
--- a/server/Battleside.js
+++ b/server/Battleside.js
@@ -397,11 +397,11 @@ Battleside = (function(){
     var self = this;
     obj.targetSide = this;
     if(obj.disabled) return;
-    var ability = Array.isArray(__flag) || card.getAbility();
+    var ability = Array.isArray(__flag) ? __flag : card.getAbility();
 
     if(Array.isArray(ability) && ability.length){
       var ret = ability.slice();
-      ret = ret.splice(0, 1);
+      ret.splice(0, 1);
       this.checkAbilities(card, obj, ret);
       ability = ability[0];
     }
@@ -443,6 +443,7 @@ Battleside = (function(){
             return;
           }
           if(replaceCard.getName() === card.getName()) return;
+          if(replaceCard.hasAbility("hero")) return;
           self.off("Decoy:replaceWith");
           var field = self.field[replaceCard.getType()];