diff --git a/projects/mtg/src/MTGCardInstance.cpp b/projects/mtg/src/MTGCardInstance.cpp
index cb448bc55..4c5f2fae7 100644
--- a/projects/mtg/src/MTGCardInstance.cpp
+++ b/projects/mtg/src/MTGCardInstance.cpp
@@ -416,11 +416,11 @@ int MTGCardInstance::setAttacker(int value){
 
 int MTGCardInstance::toggleAttacker(){
   if (!attacker){
-    if (!basicAbilities[Constants::VIGILANCE]) tap();
+    //if (!basicAbilities[Constants::VIGILANCE]) tap();
     setAttacker(1);
     return 1;
   }else{
-      untap();
+      //untap();
       setAttacker(0);
       return 1;
   }
diff --git a/projects/mtg/src/MTGRules.cpp b/projects/mtg/src/MTGRules.cpp
index bf62749e0..dac446c1f 100644
--- a/projects/mtg/src/MTGRules.cpp
+++ b/projects/mtg/src/MTGRules.cpp
@@ -693,6 +693,7 @@ int MTGAttackRule::receiveEvent(WEvent *e){
 			for (int i= 0; i < z->nb_cards; i++){
 				MTGCardInstance * card = z->cards[i];
 				if (!card->isAttacker() && card->has(Constants::MUSTATTACK)) reactToClick(card);
+				if (card->isAttacker() && !card->has(Constants::VIGILANCE)) card->tap();
 			}
 			return 1;
 		}