diff --git a/library/NAS_Templates.ttcn b/library/NAS_Templates.ttcn
index f819862..bbe7237 100644
--- a/library/NAS_Templates.ttcn
+++ b/library/NAS_Templates.ttcn
@@ -111,13 +111,15 @@
 template (value) GUTI ts_NAS_GUTI(hexstring mcc_mnc, OCT2 mmegi, OCT1 mmec, OCT4 tmsi) := {
 	oddevenIndicator := '0'B,
 	spare := '1111'B,
-	/* mcc_mnc specified in format 262f42 */
+	/* use the mcc_mnc format as specified in 3GPP TS 24.301, figure 9.9.3.12.1.
+	 * Example: mcc=262, mnc=42 => 262f42.
+	 * 	    mcc=001, mnc=01 => 001f01. */
 	mccDigit1 := mcc_mnc[0],
 	mccDigit2 := mcc_mnc[1],
 	mccDigit3 := mcc_mnc[2],
-	mncDigit3 := mcc_mnc[5],
-	mncDigit1 := mcc_mnc[3],
-	mncDigit2 := mcc_mnc[4],
+	mncDigit3 := mcc_mnc[3],
+	mncDigit1 := mcc_mnc[4],
+	mncDigit2 := mcc_mnc[5],
 	mMEGI := mmegi,
 	mMEC := mmec,
 	mTMSI := tmsi