diff --git a/library/RLCMAC_CSN1_Types.ttcn b/library/RLCMAC_CSN1_Types.ttcn
index cc1ae22..5ef7c44 100644
--- a/library/RLCMAC_CSN1_Types.ttcn
+++ b/library/RLCMAC_CSN1_Types.ttcn
@@ -416,18 +416,22 @@
 	} with {
 		variant "TAG(ps, presence = '0'B; cs, presence = '1'B)"
 	};
+	type record RepeatedPageInfoItem {
+		BIT1			presence,
+		PageInfo		item
+	} with { variant "PRESENCE(presence = '1'B)" };
+	type record of RepeatedPageInfoItem RepeatedPageInfo;
 	type record PacketPagingReq {
 		PageMode		page_mode,
 		BIT1			persistence_levels_present,
 		PersistenceLevels	persistence_levels optional,
 		BIT1			nln_present,
 		uint2_t			nln optional,
-		BIT1			repeated_pageinfo_present,
-		PageInfo		repeated_pageinfo optional
+		RepeatedPageInfo	repeated_pageinfo optional,
+		BIT1			repeated_pageinfo_term ('0'B)
 	} with {
 		variant (persistence_levels) "PRESENCE(persistence_levels_present = '1'B)"
 		variant (nln) "PRESENCE(nln_present = '1'B)"
-		variant (repeated_pageinfo) "PRESENCE(repeated_pageinfo_present = '1'B)"
 	};
 
 	/* 12.26 Extension Bits IE  */
diff --git a/library/RLCMAC_Templates.ttcn b/library/RLCMAC_Templates.ttcn
index 5bdc17d..edf6516 100644
--- a/library/RLCMAC_Templates.ttcn
+++ b/library/RLCMAC_Templates.ttcn
@@ -642,8 +642,8 @@
 						persistence_levels := *,
 						nln_present := ?,
 						nln := *,
-						repeated_pageinfo_present := ?,
-						repeated_pageinfo := *
+						repeated_pageinfo := *,
+						repeated_pageinfo_term := '0'B
 					}
 				}
 			}