diff --git a/library/GSUP_Templates.ttcn b/library/GSUP_Templates.ttcn
index 7146e97..ea2b489 100644
--- a/library/GSUP_Templates.ttcn
+++ b/library/GSUP_Templates.ttcn
@@ -175,21 +175,23 @@
 	}
 }
 
-template GSUP_IE ts_GSUP_IE_PdpInfo(template (value) octetstring apn,
-				    template (value) GSUP_PDP_Address pdp_address,
-				    template (value) octetstring pdp_qos) := {
+template (value) GSUP_IE ts_GSUP_IE_PdpInfo(template (value) OCT1 ctx_id,
+					    template (value) octetstring apn,
+					    template (value) GSUP_PDP_Address pdp_address,
+					    template (value) octetstring pdp_qos) := {
 	tag := OSMO_GSUP_PDP_INFO_IE,
 	len := 0, /* overwritten */
 	val := {
 		pdp_info := {
-			valueof(ts_GSUP_IE_APN(apn)),
+			valueof(ts_GSUP_IE_PDP_CONTEXT_ID(ctx_id)),
 			valueof(ts_GSUP_IE_PDP_ADDRESS(pdp_address)),
+			valueof(ts_GSUP_IE_APN(apn)),
 			valueof(ts_GSUP_IE_PDP_QOS(pdp_qos))
 		}
 	}
 }
 
-template (value) GSUP_IE ts_GSUP_IE_PDP_CONTEXT_ID(OCT1 ctx_id) := {
+template (value) GSUP_IE ts_GSUP_IE_PDP_CONTEXT_ID(template (value) OCT1 ctx_id) := {
 	tag := OSMO_GSUP_PDP_CONTEXT_ID_IE,
 	len := 0,
 	val := {
@@ -197,7 +199,7 @@
 	}
 }
 
-template GSUP_IE tr_GSUP_IE_PDP_CONTEXT_ID(template OCT1 ctx_id) := {
+template (present) GSUP_IE tr_GSUP_IE_PDP_CONTEXT_ID(template OCT1 ctx_id) := {
 	tag := OSMO_GSUP_PDP_CONTEXT_ID_IE,
 	len := ?,
 	val := {