diff --git a/library/L3_Templates.ttcn b/library/L3_Templates.ttcn
index 52d4a2a..e109fde 100644
--- a/library/L3_Templates.ttcn
+++ b/library/L3_Templates.ttcn
@@ -838,11 +838,20 @@
 	digits := digits
 }
 
+private function f_pad_digits(hexstring digits) return hexstring {
+	if (lengthof(digits) mod 2 != 0) {
+		/* Add trailing nibble of 1-bit padding, like the CallingPartyBCD_Number encoder would do.
+		 * Otherwise our template won't match the data received (see OS#2930). */
+		return digits & 'F'H;
+	}
+	return digits;
+}
+
 template CallingPartyBCD_Number tr_Calling(template hexstring digits) := {
 	elementIdentifier := '5C'O,
 	lengthIndicator := ?,
 	oct3 := ?,
-	digits := digits
+	digits := f_pad_digits(valueof(digits))
 }
 
 type integer SpeechVer;
diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn
index c0cd9d3..2a6c034 100644
--- a/msc/MSC_Tests.ttcn
+++ b/msc/MSC_Tests.ttcn
@@ -1722,8 +1722,7 @@
 /* LU followed by MT call (including paging) */
 private function f_tc_lu_and_mt_call(charstring id, BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr {
 	f_init_handler(pars);
-	//FIXME: odd digits var CallParameters cpars := valueof(t_CallParams('12345'H, 0));
-	var CallParameters cpars := valueof(t_CallParams('123456'H, 0));
+	var CallParameters cpars := valueof(t_CallParams('12345'H, 0));
 	cpars.bss_rtp_port := 1110;
 	cpars.mgcp_connection_id_bss := '10004'H;
 	cpars.mgcp_connection_id_mss := '10005'H;
@@ -1845,8 +1844,7 @@
 /* LU followed by MT call (including paging) */
 private function f_tc_lu_and_mt_call_no_dlcx_resp(charstring id, BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr {
 	f_init_handler(pars);
-	//FIXME: odd digits var CallParameters cpars := valueof(t_CallParams('12345'H, 0));
-	var CallParameters cpars := valueof(t_CallParams('123456'H, 0));
+	var CallParameters cpars := valueof(t_CallParams('12345'H, 0));
 	cpars.bss_rtp_port := 1110;
 	cpars.mgcp_connection_id_bss := '10004'H;
 	cpars.mgcp_connection_id_mss := '10005'H;