diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn
index 972d912..2a05d26 100644
--- a/bsc/BSC_Tests.ttcn
+++ b/bsc/BSC_Tests.ttcn
@@ -949,7 +949,7 @@
 	GsmLac		lac,
 	GsmCellId	ci
 };
-private const Cell_Identity cid := { '001'H, '001'H, 1, 0 };
+private const Cell_Identity cid := { '001'H, 'f01'H, 1, 0 };
 
 type set of integer BtsIdList;
 
diff --git a/library/BSSMAP_Templates.ttcn b/library/BSSMAP_Templates.ttcn
index 77ff7e4..5d2bff2 100644
--- a/library/BSSMAP_Templates.ttcn
+++ b/library/BSSMAP_Templates.ttcn
@@ -665,7 +665,11 @@
 }
 
 private function f_enc_mcc_mnc(GsmMcc mcc, GsmMnc mnc) return OCT3 {
-	return hex2oct(mcc[1] & mcc[0] & mnc[2] & mcc[2] & mnc[1] & mnc[0]);
+	if (mnc[0] == 'f'H) {
+		return hex2oct(mcc[1] & mcc[0] & mnc[0] & mcc[2] & mnc[2] & mnc[1]);
+	} else {
+		return hex2oct(mcc[1] & mcc[0] & mnc[2] & mcc[2] & mnc[1] & mnc[0]);
+	}
 }
 
 template BSSMAP_FIELD_CellIdentification_CGI ts_BSSMAP_CI_CGI(GsmMcc mcc, GsmMnc mnc, GsmLac lac, GsmCellId ci) := {