diff --git a/library/DIAMETER_Templates.ttcn b/library/DIAMETER_Templates.ttcn
index e13e31f..85725fc 100644
--- a/library/DIAMETER_Templates.ttcn
+++ b/library/DIAMETER_Templates.ttcn
@@ -1408,11 +1408,11 @@
 		    ete_id := ete_id,
 		    avps := superset(
 			tr_AVP_SessionId(sess_id),
-			tr_AVP_ResultCode(DIAMETER_SUCCESS),
 			tr_AVP_AuthSessionState(NO_STATE_MAINTAINED),
-			tr_AVP_3GPP_AuthInfo(auth_info_contents),
 			tr_AVP_OriginHost(orig_host),
-			tr_AVP_OriginRealm(orig_realm)
+			tr_AVP_OriginRealm(orig_realm),
+			tr_AVP_ResultCode(DIAMETER_SUCCESS),
+			tr_AVP_3GPP_AuthInfo(auth_info_contents)
 	));