diff --git a/library/GSM_RR_Types.ttcn b/library/GSM_RR_Types.ttcn
index b1e6809..2ceb1f8 100644
--- a/library/GSM_RR_Types.ttcn
+++ b/library/GSM_RR_Types.ttcn
@@ -114,7 +114,12 @@
 		BIT2		zero_one
 	} with { variant "" };
 
-	template L2PseudoLength t_L2Pseudolength(template uint6_t len) := {
+	template L2PseudoLength tr_L2Pseudolength(template uint6_t len) := {
+		l2_plen := len,
+		zero_one := '01'B
+	};
+
+	template (value) L2PseudoLength ts_L2Pseudolength(uint6_t len) := {
 		l2_plen := len,
 		zero_one := '01'B
 	};
@@ -127,12 +132,20 @@
 	} with { variant "" };
 
 	template RrHeader t_RrHeader(RrMessageType msg_type, template uint6_t len) := {
-		l2_plen := t_L2Pseudolength(len),
+		l2_plen := tr_L2Pseudolength(len),
 		skip_indicator := 0,
 		rr_protocol_discriminator := 6,
 		message_type := msg_type
 	};
 
+	template (value) RrHeader ts_RrHeader(RrMessageType msg_type, uint6_t len) := {
+		l2_plen := ts_L2Pseudolength(len),
+		skip_indicator := 0,
+		rr_protocol_discriminator := 6,
+		message_type := msg_type
+	};
+
+
 	type record RrL3Header {
 		uint4_t		skip_indicator,
 		uint4_t		rr_protocol_discriminator,