diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn
index 76702d4..1359dc7 100644
--- a/msc/BSC_ConnectionHandler.ttcn
+++ b/msc/BSC_ConnectionHandler.ttcn
@@ -1059,17 +1059,12 @@
 /* Allocate a call reference and send SETUP via MNCC to MSC */
 function f_mt_call_initiate(inout CallParameters cpars)
 runs on BSC_ConnHdlr {
-	var template MNCC_bearer_cap bcap := ts_MNCC_bcap_voice;
-
-	if (cpars.csd) {
-		bcap := ts_MNCC_bcap_data;
-	}
-
 	cpars.mo_call := false;
 	cpars.mncc_callref := f_rnd_int(2147483648);
 
 	MNCC.send(ts_MNCC_SETUP_req(cpars.mncc_callref, hex2str(g_pars.msisdn),
-					hex2str(cpars.called_party), hex2str(g_pars.imsi), bcap));
+					hex2str(cpars.called_party), hex2str(g_pars.imsi),
+					cpars.mncc_bearer_cap));
 }
 
 private template (value) SDP_Message ts_SDP_CRCX_CN(CallParameters cpars) :=