diff --git a/projects/mtg/bin/Res/test/armadillo_cloak.txt b/projects/mtg/bin/Res/test/armadillo_cloak.txt
index be34b3d6e..53c2d373b 100644
--- a/projects/mtg/bin/Res/test/armadillo_cloak.txt
+++ b/projects/mtg/bin/Res/test/armadillo_cloak.txt
@@ -19,9 +19,11 @@ next
 #blockers
 grizzly bears
 next
-#combat damage
+#combat damage ->Guicombat
 next
-combat end
+#combat damage assigned
+next
+#combat end
 [ASSERT]
 COMBATEND
 [PLAYER1]
@@ -29,5 +31,5 @@ inplay:Wildslayer Elves,Armadillo Cloak
 life:25
 [PLAYER2]
 graveyard:grizzly bears
-life:20
+life:17
 [END]
\ No newline at end of file
diff --git a/projects/mtg/bin/Res/test/generic/m10_blockers.txt b/projects/mtg/bin/Res/test/generic/m10_blockers.txt
index 0b27316d9..31f56031f 100644
--- a/projects/mtg/bin/Res/test/generic/m10_blockers.txt
+++ b/projects/mtg/bin/Res/test/generic/m10_blockers.txt
@@ -15,6 +15,8 @@ next
 #blockers order
 Drudge Skeletons
 next
+#combat damage ->Gui
+next
 #combat damage
 next
 #combat end
diff --git a/projects/mtg/bin/Res/test/generic/m10_blockers2.txt b/projects/mtg/bin/Res/test/generic/m10_blockers2.txt
index 7040ea564..7883018aa 100644
--- a/projects/mtg/bin/Res/test/generic/m10_blockers2.txt
+++ b/projects/mtg/bin/Res/test/generic/m10_blockers2.txt
@@ -17,6 +17,8 @@ next
 dragon engine
 Drudge Skeletons
 next
+#combat damage -> Gui
+next
 #combat damage
 next
 #combat end
diff --git a/projects/mtg/bin/daily_build/template.exe b/projects/mtg/bin/daily_build/template.exe
index a7bc83547..5f09c39d9 100644
Binary files a/projects/mtg/bin/daily_build/template.exe and b/projects/mtg/bin/daily_build/template.exe differ
diff --git a/projects/mtg/src/GuiCombat.cpp b/projects/mtg/src/GuiCombat.cpp
index 0267f27c3..1ca63f7c1 100644
--- a/projects/mtg/src/GuiCombat.cpp
+++ b/projects/mtg/src/GuiCombat.cpp
@@ -81,8 +81,8 @@ void GuiCombat::validateDamage()
 {
   switch (step)
     {
-    case FIRST_STRIKE : resolve(); go->nextCombatStep(); break;
-    case DAMAGE       : resolve(); go->nextGamePhase(); break;
+    case FIRST_STRIKE : go->nextCombatStep(); break;
+    case DAMAGE       : go->nextGamePhase(); break;
     default: cout << "COMBAT : Cannot validate damage in this phase" << endl; break;
     }
 }
@@ -121,6 +121,7 @@ void GuiCombat::removeOne(DefenserDamaged* blocker, CombatStep step)
 }
 
 bool GuiCombat::clickOK(){
+  cursor_pos = NONE;
   switch (step)
     {
     case BLOCKERS         : assert(false); return false; // that should not happen