diff --git a/projects/mtg/bin/Res/sets/MIR/_cards.dat b/projects/mtg/bin/Res/sets/MIR/_cards.dat
index 8d460a342..cedf57f84 100644
--- a/projects/mtg/bin/Res/sets/MIR/_cards.dat
+++ b/projects/mtg/bin/Res/sets/MIR/_cards.dat
@@ -330,7 +330,7 @@ rarity=C
 mana={3}{R}
 type=Creature
 subtype=Cyclops
-auto=aslongas(creature|myBattlefield) mustattack
+auto=aslongas(creature[attacking]|myBattlefield) mustattack
 power=3
 toughness=4
 [/card]
diff --git a/projects/mtg/bin/Res/test/_tests.txt b/projects/mtg/bin/Res/test/_tests.txt
index 74249c0b2..b2bd45d2f 100644
--- a/projects/mtg/bin/Res/test/_tests.txt
+++ b/projects/mtg/bin/Res/test/_tests.txt
@@ -135,6 +135,8 @@ dromad_purebred.txt
 dross_harvester.txt
 duskwalker.txt
 ebony_horse.txt
+ekundu_cyclops1_i218.txt
+ekundu_cyclops2_i218.txt
 elvish_piper.txt
 elvish_promenade.txt
 emblem_of_the_warmind.txt
diff --git a/projects/mtg/bin/Res/test/ekundu_cyclops1_i218.txt b/projects/mtg/bin/Res/test/ekundu_cyclops1_i218.txt
new file mode 100644
index 000000000..4d09ce649
--- /dev/null
+++ b/projects/mtg/bin/Res/test/ekundu_cyclops1_i218.txt
@@ -0,0 +1,22 @@
+#NAME: Ekundu Cyclops 1
+#DESC: Tests whether Ekundu Cyclops
+#DESC: automatically attacks when
+#DESC: another creature of its controller
+#DESC: is attacking
+[INIT]
+combatattackers
+[PLAYER1]
+inplay:Ekundu Cyclops,Grizzly Bears
+[PLAYER2]
+[DO]
+Grizzly Bears
+next
+next
+next
+[ASSERT]
+combatend
+[PLAYER1]
+inplay:Ekundu Cyclops,Grizzly Bears
+[PLAYER2]
+life:15
+[END]
diff --git a/projects/mtg/bin/Res/test/ekundu_cyclops2_i218.txt b/projects/mtg/bin/Res/test/ekundu_cyclops2_i218.txt
new file mode 100644
index 000000000..d457193be
--- /dev/null
+++ b/projects/mtg/bin/Res/test/ekundu_cyclops2_i218.txt
@@ -0,0 +1,21 @@
+#NAME: Ekundu Cyclops 2
+#DESC: Verifies that Ekundu Cyclops
+#DESC: doesn't already attack when
+#DESC: another creature of its controller
+#DESC: is merely present
+[INIT]
+combatattackers
+[PLAYER1]
+inplay:Ekundu Cyclops,Grizzly Bears
+[PLAYER2]
+[DO]
+next
+next
+next
+[ASSERT]
+endofturn
+[PLAYER1]
+inplay:Ekundu Cyclops,Grizzly Bears
+[PLAYER2]
+life:20
+[END]