diff --git a/Tactical/Handle UI Plan.cpp b/Tactical/Handle UI Plan.cpp
index 0669e172..de94ba0a 100644
--- a/Tactical/Handle UI Plan.cpp	
+++ b/Tactical/Handle UI Plan.cpp	
@@ -79,7 +79,7 @@ BOOLEAN AddUIPlan( INT32 sGridNo, UINT8 ubPlanID )
 			if ( TacticalCreateSoldier( &MercCreateStruct, &ubNewIndex ) )
 			{
 				// Get pointer to soldier
-				GetSoldier( &pPlanSoldier, (UINT16)ubNewIndex );
+				GetSoldier( &pPlanSoldier, ubNewIndex );
 
 				pPlanSoldier->sPlannedTargetX = -1;
 				pPlanSoldier->sPlannedTargetY = -1;
diff --git a/Tactical/Overhead.cpp b/Tactical/Overhead.cpp
index 6b5223ab..cadb4815 100644
--- a/Tactical/Overhead.cpp
+++ b/Tactical/Overhead.cpp
@@ -832,21 +832,21 @@ BOOLEAN ShutdownOverhead( )
     return( TRUE );
 }
 
-BOOLEAN GetSoldier( SOLDIERTYPE **ppSoldier, UINT16 usSoldierIndex )
+BOOLEAN GetSoldier( SOLDIERTYPE **ppSoldier, SoldierID usSoldierIndex )
 {
     // Check range of index given
     *ppSoldier = NULL;
-    if ( usSoldierIndex < 0 || usSoldierIndex > TOTAL_SOLDIERS-1 )
+    if ( usSoldierIndex >= NOBODY )
     {
         // Set debug message
         return( FALSE );
     }
     // Check if a guy exists here
     // Does another soldier exist here?
-    if ( MercPtrs[ usSoldierIndex ]->bActive )
+    if ( usSoldierIndex->bActive )
     {
         // Set Existing guy
-        *ppSoldier = MercPtrs[ usSoldierIndex ];
+        *ppSoldier = usSoldierIndex;
         return( TRUE);
     }
     else
diff --git a/Tactical/Overhead.h b/Tactical/Overhead.h
index 0b7808fa..b5e15019 100644
--- a/Tactical/Overhead.h
+++ b/Tactical/Overhead.h
@@ -203,7 +203,7 @@ void ShutdownTacticalEngine( );
 
 BOOLEAN InitOverhead( );
 BOOLEAN ShutdownOverhead( );
-BOOLEAN GetSoldier( SOLDIERTYPE **ppSoldier, UINT16 usSoldierIndex );
+BOOLEAN GetSoldier( SOLDIERTYPE **ppSoldier, SoldierID usSoldierIndex );
 
 UINT32 CountNonVehiclesOnPlayerTeam( );