diff --git a/extra-resources/keyword-noattack.js b/extra-resources/keyword-noattack.js
index f79cf70c..28be49a1 100644
--- a/extra-resources/keyword-noattack.js
+++ b/extra-resources/keyword-noattack.js
@@ -7,7 +7,7 @@ keywords.cards.noAttack = function (entity, obj, value) {
 	noAttackCreatures.add(obj.name);
 }
 
-keywords.afterCards.push(function (game) {
+keywords.afterCards.push(function (game, cardData, cardEntities) {
     var System = Java.type("net.zomis.cardshifter.ecs.usage.DenyActionForNames");
 	game.addSystem(new System(ATTACK_ACTION, noAttackCreatures));
 });
diff --git a/extra-resources/keywords.js b/extra-resources/keywords.js
index 5eb055d2..4c2c2f7f 100644
--- a/extra-resources/keywords.js
+++ b/extra-resources/keywords.js
@@ -22,14 +22,16 @@ function applyEntity(game, card, entity, keyword) {
 
 
 function applyCardKeywords(game, zone, data) {
+    var cardEntities = [];
     for (var i = 0; i < data.cards.length; i++) {
         var card = data.cards[i];
         var entity = game.newEntity();
         applyEntity(game, card, entity, keywords.cards);
         zone.addOnBottom(entity);
+        cardEntities.push(entity);
     }
     for (var i = 0; i < keywords.afterCards.length; i++) {
-        keywords.afterCards[i](game);
+        keywords.afterCards[i](game, data, cardEntities);
     }
 }