diff --git a/sp/src/game/server/ai_expresserfollowup.cpp b/sp/src/game/server/ai_expresserfollowup.cpp
index 38a83a3d..cba7c26b 100644
--- a/sp/src/game/server/ai_expresserfollowup.cpp
+++ b/sp/src/game/server/ai_expresserfollowup.cpp
@@ -78,6 +78,7 @@ static void DispatchComeback( CAI_ExpresserWithFollowup *pExpress, CBaseEntity *
 	// See DispatchFollowupThroughQueue()
 	criteria.AppendCriteria( "From_idx", CNumStr( pSpeaker->entindex() ) );
 	criteria.AppendCriteria( "From_class", pSpeaker->GetClassname() );
+	pSpeaker->AppendContextToCriteria( criteria, "From_" );
 #endif
 	// if a SUBJECT criteria is missing, put it back in.
 	if ( criteria.FindCriterionIndex( "Subject" ) == -1 )