diff --git a/src/battle/entities.c b/src/battle/entities.c
index e0018b7..76e5e0a 100644
--- a/src/battle/entities.c
+++ b/src/battle/entities.c
@@ -201,7 +201,7 @@ void doEntities(void)
 			{
 				numAllies++;
 				
-				if (e->health > 0 && (battle.epic || e->active) && !(e->flags & EF_NO_EPIC))
+				if (e->health > 0 && e->active && !(e->flags & EF_NO_EPIC))
 				{
 					numActiveAllies++;
 				}
@@ -210,7 +210,7 @@ void doEntities(void)
 			{
 				numEnemies++;
 				
-				if (e->health > 0 && (battle.epic || e->active) && !(e->flags & EF_NO_EPIC))
+				if (e->health > 0 && e->active && !(e->flags & EF_NO_EPIC))
 				{
 					numActiveEnemies++;
 				}
@@ -220,8 +220,8 @@ void doEntities(void)
 		prev = e;
 	}
 	
-	battle.numAllies = numActiveAllies;
-	battle.numEnemies = numActiveEnemies;
+	battle.numAllies = (battle.epic) ? numAllies : numActiveAllies;
+	battle.numEnemies = (battle.epic) ? numEnemies : numActiveEnemies;
 	
 	if (!battle.numInitialEnemies)
 	{