diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn
index 355f3e2d9..a0e0559a3 100644
--- a/bsc/BSC_Tests.ttcn
+++ b/bsc/BSC_Tests.ttcn
@@ -949,7 +949,7 @@ type record Cell_Identity {
 	GsmLac		lac,
 	GsmCellId	ci
 };
-private const Cell_Identity cid := { '001'H, 'f01'H, 1, 0 };
+private const Cell_Identity cid := { '001'H, '01'H, 1, 0 };
 
 type set of integer BtsIdList;
 
diff --git a/library/BSSMAP_Templates.ttcn b/library/BSSMAP_Templates.ttcn
index 5d2bff26e..5d1389961 100644
--- a/library/BSSMAP_Templates.ttcn
+++ b/library/BSSMAP_Templates.ttcn
@@ -665,8 +665,8 @@ template BSSMAP_FIELD_CellIdentificationList ts_BSSMAP_CIL_noCell := {
 }
 
 private function f_enc_mcc_mnc(GsmMcc mcc, GsmMnc mnc) return OCT3 {
-	if (mnc[0] == 'f'H) {
-		return hex2oct(mcc[1] & mcc[0] & mnc[0] & mcc[2] & mnc[2] & mnc[1]);
+	if (lengthof(mnc) == 2) {
+		return hex2oct(mcc[1] & mcc[0] & 'F'H & mcc[2] & mnc[1] & mnc[0]);
 	} else {
 		return hex2oct(mcc[1] & mcc[0] & mnc[2] & mcc[2] & mnc[1] & mnc[0]);
 	}