diff --git a/Multiplayer/client.cpp b/Multiplayer/client.cpp
index d466a98f8..580364f44 100644
--- a/Multiplayer/client.cpp
+++ b/Multiplayer/client.cpp
@@ -2130,7 +2130,10 @@ void recieveDEATH (RPCParameters *rpcParameters)
 	{
 		pSoldier->usAnimState=50;
 		ScreenMsg( FONT_YELLOW, MSG_CHAT, L"made merc corpse/dead");	
+		RemoveManAsTarget(pSoldier);
 		TurnSoldierIntoCorpse( pSoldier, TRUE, TRUE );
+	
+
 			if ( CheckForEndOfBattle( FALSE ) )
 			{
 			ScreenMsg( FONT_LTGREEN, MSG_CHAT, L"All over red rover...");
diff --git a/Multiplayer/test_space.cpp b/Multiplayer/test_space.cpp
index 7e4ce03db..171e278d4 100644
--- a/Multiplayer/test_space.cpp
+++ b/Multiplayer/test_space.cpp
@@ -113,7 +113,7 @@ void test_func2 (void)//now bound to "0" //currently displays coordinates of the
 
 SOLDIERTYPE * pSoldier=MercPtrs[ 0 ];
 
-pSoldier->ubServicePartner = NOBODY;
+RemoveOneOpponent( pSoldier );
 //SOLDIERTYPE * pSoldier2=MercPtrs[ 127 ];
 //
 ////pSoldier->AdjustNoAPToFinishMove( TRUE );