diff --git a/library/GSM_RR_Types.ttcn b/library/GSM_RR_Types.ttcn
index 49ceae3..b090d25 100644
--- a/library/GSM_RR_Types.ttcn
+++ b/library/GSM_RR_Types.ttcn
@@ -590,8 +590,7 @@
 		/* TODO: starting time TLV */
 		IaRestOctets			rest_octets
 	} with { variant (chan_desc) "PRESENCE(ded_or_tbf.tbf = false)"
-		 variant (pkt_chan_desc) "PRESENCE(ded_or_tbf.tbf = true)"
-		 variant "PADDING(168), PADDING_PATTERN('00101011'B)" };
+		 variant (pkt_chan_desc) "PRESENCE(ded_or_tbf.tbf = true)" };
 
 	/* 9.1.20 */
 	type record ReqRefWaitInd {
@@ -683,7 +682,10 @@
 				pag_req_2, header.message_type = PAGING_REQUEST_TYPE_2;
 				pag_req_3, header.message_type = PAGING_REQUEST_TYPE_3;
 			      other, OTHERWISE;
-			)" };
+			)"
+		 /* Total message length: 184 = 23 * 8. Pad spare bits with '2B'O. */
+		 variant "PADDING(184), PADDING_PATTERN('00101011'B)"
+	};
 
 	external function enc_GsmRrMessage(in GsmRrMessage msg) return octetstring
 		with { extension "prototype(convert) encode(RAW)" };