diff --git a/library/GTPv2_Templates.ttcn b/library/GTPv2_Templates.ttcn
index c09bca8..65bc559 100644
--- a/library/GTPv2_Templates.ttcn
+++ b/library/GTPv2_Templates.ttcn
@@ -939,12 +939,11 @@
 		privateExtension := omit
 	}});
 template (present) PDU_GTPCv2
-tr_GTP2C_DeleteSessionReq(template (present) OCT4 d_teid,
+tr_GTP2C_DeleteSessionReq(template (present) OCT4 d_teid := ?,
 			  template (present) OCT3 seq := ?,
-			  template (omit) GTP2C_Cause cause,
-			  template (present) FullyQualifiedTEID sender_fteid,
-			  template FullyQualifiedTEID_List teid_list,
-			  template (present) uint4_t bearer_id) :=
+			  template GTP2C_Cause cause := *,
+			  template (present) uint4_t bearer_id := ?,
+			  template FullyQualifiedTEID sender_fteid := *) :=
 tr_PDU_GTP2C(d_teid, seq, {
 	deleteSessionRequest := {
 		cause := fr_GTP2C_Cause(cause),