diff --git a/src/csl_dha.c b/src/csl_dha.c
index 6a10e47..e17d9be 100644
--- a/src/csl_dha.c
+++ b/src/csl_dha.c
@@ -43,7 +43,6 @@ static ComponentPortion_t *assemble_components(ComponentPortion_t *cp, struct tc
 int tcap_csl_tc_uni_req(struct tcap_dialogue *td, OBJECT_IDENTIFIER_t *app_ctx, struct user_information *user_info)
 {
 	struct TCMessage tcm;
-	struct ComponentPortion cp;
 	ExternalPDU_t ext;
 	UniDialoguePDU_t dial;
 	ANY_t any;
@@ -69,12 +68,12 @@ int tcap_csl_tc_uni_req(struct tcap_dialogue *td, OBJECT_IDENTIFIER_t *app_ctx,
 		ANY_fromType(&ext.dialog, &asn_DEF_UniDialoguePDU, &dial);
 		memset(&any, 0, sizeof(any));
 		ANY_fromType(&any, &asn_DEF_ExternalPDU, &ext);
-		tcm.choice.begin.dialoguePortion = (OCTET_STRING_t *) &any;
+		tcm.choice.unidirectional.dialoguePortion = (OCTET_STRING_t *) &any;
 	}
 	/* Request components to CHA */
 	/* Process components */
 	/* Assemble TSL user data */
-	tcm.choice.begin.components = assemble_components(&cp, td);
+	assemble_components(&tcm.choice.unidirectional.components, td);
 
 	/* TR-UNI-REQ to TSL */
 	rc = tcap_tco_tr_uni_req(&td->trans, &tcm);