diff --git a/src/common/kernel/battle.c b/src/common/kernel/battle.c
index a3c815dc2..9f433ef3b 100644
--- a/src/common/kernel/battle.c
+++ b/src/common/kernel/battle.c
@@ -1274,7 +1274,7 @@ count_enemies(battle * b, const fighter * af, int minrow, int maxrow, int select
         return b->fast.enemies[select-SELECT_FIND];
       } 
     }
-  } else {
+  } else if (select!=SELECT_FIND || b->alive!=b->fast.alive) {
     b->fast.side = as;
     b->fast.status = sr;
     b->fast.minrow = minrow;
diff --git a/src/res/messages.xml b/src/res/messages.xml
index 89bb4022c..b5cc4fb20 100644
--- a/src/res/messages.xml
+++ b/src/res/messages.xml
@@ -6439,8 +6439,8 @@
       <arg name="spell" type="spell"/>
       <arg name="effect" type="string"/>
     </type>
-    <text locale="de">"$unit($mage) zaubert $spell($spell)$if(strlen($effect),": $effect","")."</text>
-    <text locale="en">"$unit($mage) casts $spell($spell)$if(strlen($effect),": $effect","")."</text>
+    <text locale="de">"$unit($mage) zaubert $spell($spell)$if($strlen($effect),": $effect","")."</text>
+    <text locale="en">"$unit($mage) casts $spell($spell)$if($strlen($effect),": $effect","")."</text>
   </message>
   <message name="battle::killed" section="battle">
     <type>