diff --git a/Tactical/Dialogue Control.cpp b/Tactical/Dialogue Control.cpp
index 5a9f9afa1..a6a5abefa 100644
--- a/Tactical/Dialogue Control.cpp	
+++ b/Tactical/Dialogue Control.cpp	
@@ -1941,6 +1941,7 @@ void CreateTalkingUI( INT8 bUIHandlerID, INT32 iFaceIndex, UINT8 ubCharacterNum,
 CHAR8 *GetDialogueDataFilename( UINT8 ubCharacterNum, UINT16 usQuoteNum, BOOLEAN fWavFile )
 {
 	static CHAR8 zFileName[164];
+	static CHAR8 zFileNameExists[164];
 	UINT8		ubFileNumID;
 
 	// Are we an NPC OR an RPC that has not been recruited?
@@ -1987,11 +1988,41 @@ CHAR8 *GetDialogueDataFilename( UINT8 ubCharacterNum, UINT16 usQuoteNum, BOOLEAN
 		ubFileNumID = ubCharacterNum;
 
 		// ATE: If we are merc profile ID #151-154, all use 151's data....
-		if ( ubCharacterNum >= HERVE && ubCharacterNum <= CARLO )
+		//if ( ubCharacterNum >= HERVE && ubCharacterNum <= CARLO )
+		//{
+			//ubFileNumID = HERVE;
+		//}
+		
+			if ( ubCharacterNum == HERVE )
+			{
+					ubFileNumID = HERVE;	
+			}
+			else if ( ubCharacterNum == PETER )
+			{
+				sprintf( (char *)zFileNameExists,"NPCDATA\\%03d.EDT", PETER );
+				if ( !FileExists( zFileName ) )
+					ubFileNumID = HERVE;
+				else
+					ubFileNumID = PETER;
+			}
+			else if ( ubCharacterNum == ALBERTO )
+			{
+				sprintf( (char *)zFileNameExists,"NPCDATA\\%03d.EDT", ALBERTO );
+				if ( !FileExists( zFileName ) )
+					ubFileNumID = HERVE;
+				else
+					ubFileNumID = ALBERTO;
+			}
+			else if ( ubCharacterNum == CARLO )
 		{
+				sprintf( (char *)zFileNameExists,"NPCDATA\\%03d.EDT", CARLO );
+				if ( !FileExists( zFileName ) )
 			ubFileNumID = HERVE;
+				else
+					ubFileNumID = CARLO;
 		}
 
+
 		// If we are character #155, check fact!
 		if ( ubCharacterNum == MANNY && !gubFact[ FACT_MANNY_IS_BARTENDER ] )
 		{
diff --git a/TacticalAI/NPC.cpp b/TacticalAI/NPC.cpp
index 3f69f84bb..c1f156c4e 100644
--- a/TacticalAI/NPC.cpp
+++ b/TacticalAI/NPC.cpp
@@ -148,8 +148,35 @@ NPCQuoteInfo * LoadQuoteFile( UINT8 ubNPC )
 
 	if ( ubNPC == PETER || ubNPC == ALBERTO || ubNPC == CARLO )
 	{
-		// use a copy of Herve's data file instead!
-		sprintf( zFileName, "NPCData\\%03d.npc", HERVE );
+	
+		if ( ubNPC == PETER )
+		{
+			sprintf( zFileName, "NPCData\\%03d.npc", PETER );
+			if ( !FileExists( zFileName ) )
+			{
+				// use a copy of Herve's data file instead!
+				sprintf( zFileName, "NPCData\\%03d.npc", HERVE );
+			}
+		}		
+		else if ( ubNPC == ALBERTO )
+		{
+			sprintf( zFileName, "NPCData\\%03d.npc", ALBERTO );
+			if ( !FileExists( zFileName ) )
+			{
+				// use a copy of Herve's data file instead!
+				sprintf( zFileName, "NPCData\\%03d.npc", HERVE );
+			}
+		}	
+		else if ( ubNPC == CARLO )
+		{
+			sprintf( zFileName, "NPCData\\%03d.npc", CARLO );
+			if ( !FileExists( zFileName ) )
+			{
+				// use a copy of Herve's data file instead!
+				sprintf( zFileName, "NPCData\\%03d.npc", HERVE );
+			}
+		}	
+
 	}
 	//else if ( ubNPC < FIRST_RPC || ubNPC >= GASTON || (ubNPC < FIRST_NPC && gMercProfiles[ ubNPC ].ubMiscFlags & PROFILE_MISC_FLAG_RECRUITED ) )
 	//new profiles by Jazz