diff --git a/TacticalAI/AIInternals.h b/TacticalAI/AIInternals.h
index b3293287..2e049958 100644
--- a/TacticalAI/AIInternals.h
+++ b/TacticalAI/AIInternals.h
@@ -154,14 +154,14 @@ public:
 class UnderFire
 {
 private:
-	BOOLEAN fEnable;
-	UINT16 usUnderFireCnt;
-	UINT16 usUnderFireID[MAXUNDERFIRE];
-	UINT8 ubUnderFireCTH[MAXUNDERFIRE];
+	BOOLEAN		fEnable;
+	UINT16		usUnderFireCnt;
+	SoldierID	usUnderFireID[MAXUNDERFIRE];
+	UINT8		ubUnderFireCTH[MAXUNDERFIRE];
 public:
 	UnderFire(void){ Clear(); fEnable = FALSE; }
 	void Clear(void);
-	void Add(UINT16 usID, UINT8 ubCTH);
+	void Add(SoldierID usID, UINT8 ubCTH);
 	void Enable(void){ fEnable=TRUE; }
 	void Disable(void){ fEnable=FALSE; }
 	UINT16 GetUnderFireCnt(void){ return(usUnderFireCnt); }
diff --git a/TacticalAI/Attacks.cpp b/TacticalAI/Attacks.cpp
index 703cc950..481c1f0a 100644
--- a/TacticalAI/Attacks.cpp
+++ b/TacticalAI/Attacks.cpp
@@ -3417,11 +3417,11 @@ UnderFire gUnderFire;
 void UnderFire::Clear(void)
 {
 	usUnderFireCnt = 0;
-	memset(usUnderFireID, 0, sizeof(usUnderFireID));
+	memset(usUnderFireID, TOTAL_SOLDIERS, sizeof(usUnderFireID));
 	memset(ubUnderFireCTH, 0, sizeof(ubUnderFireCTH));
 }
 
-void UnderFire::Add(UINT16 usID, UINT8 ubCTH)
+void UnderFire::Add(SoldierID usID, UINT8 ubCTH)
 {
 	if (!fEnable)
 		return;
@@ -3448,7 +3448,7 @@ UINT16 UnderFire::Count(INT8 bTeam)
 	UINT16 cnt = 0;
 	for (UINT16 i = 0; i < usUnderFireCnt; i++)
 	{
-		if (MercPtrs[usUnderFireID[i]]->bTeam == bTeam)
+		if (usUnderFireID[i]->bTeam == bTeam)
 			++cnt;
 	}
 	return(cnt);
@@ -3459,7 +3459,7 @@ UINT8 UnderFire::Chance(INT8 bTeam, INT8 bSide, BOOLEAN fCheckNeutral)
 	UINT8 cth = 0;
 	for (UINT16 i = 0; i < usUnderFireCnt; i++)
 	{
-		if ((MercPtrs[usUnderFireID[i]]->bTeam == bTeam || MercPtrs[usUnderFireID[i]]->bSide == bSide || fCheckNeutral && MercPtrs[usUnderFireID[i]]->aiData.bNeutral) &&
+		if ((usUnderFireID[i]->bTeam == bTeam || usUnderFireID[i]->bSide == bSide || fCheckNeutral && usUnderFireID[i]->aiData.bNeutral) &&
 			ubUnderFireCTH[i] > cth)
 		{
 			cth = ubUnderFireCTH[i];