diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn
index 4be8d2b7e..cf468cf84 100644
--- a/bts/BTS_Tests.ttcn
+++ b/bts/BTS_Tests.ttcn
@@ -1812,7 +1812,7 @@ private altstep as_l1_sacch() runs on ConnHdlr {
 	var L1ctlDlMessage l1_dl;
 	[] L1CTL.receive(tr_L1CTL_DATA_IND(g_chan_nr, tr_RslLinkID_SACCH(?))) -> value l1_dl {
 		log("SACCH received: ", l1_dl.payload.data_ind.payload);
-		var GsmRrL3Message meas_rep := valueof(ts_MEAS_REP(true, mp_rxlev_exp, mp_rxlev_exp, 0, 0, omit));
+		var GsmRrL3Message meas_rep := valueof(ts_MEAS_REP(true, mp_rxlev_exp, mp_rxlev_exp));
 		var LapdmFrameAB lb := valueof(ts_LAPDm_AB(0, false, false, enc_GsmRrL3Message(meas_rep)));
 		log("LAPDm: ", lb);
 
diff --git a/library/GSM_RR_Types.ttcn b/library/GSM_RR_Types.ttcn
index b4aff10a3..8cb824d2f 100644
--- a/library/GSM_RR_Types.ttcn
+++ b/library/GSM_RR_Types.ttcn
@@ -1099,9 +1099,12 @@ module GSM_RR_Types {
 		}
 	};
 
-	template (value) GsmRrL3Message ts_MEAS_REP(boolean valid, uint6_t rxl_f, uint6_t rxl_s,
-						  uint3_t rxq_f, uint3_t rxq_s,
-						  template (omit) NcellReports reps) := {
+	template (value) GsmRrL3Message ts_MEAS_REP(boolean valid,
+						    template (value) uint6_t rxl_f,
+						    template (value) uint6_t rxl_s,
+						    template (value) uint3_t rxq_f := 0,
+						    template (value) uint3_t rxq_s := 0,
+						    template (omit) NcellReports reps := omit) := {
 		header := t_RrL3Header(MEASUREMENT_REPORT),
 		payload := {
 			meas_rep := {