diff --git a/library/BSSMAP_Templates.ttcn b/library/BSSMAP_Templates.ttcn
index 49844e7..8227a14 100644
--- a/library/BSSMAP_Templates.ttcn
+++ b/library/BSSMAP_Templates.ttcn
@@ -200,18 +200,12 @@
 type uint16_t BssmapLAC;
 type uint16_t BssmapCI;
 
-/*
-template BSSMAP_IE_CellIdentifier ts_CellId_CGI(mcc, mnc, lac, ci)
+template BSSMAP_IE_CellIdentifier ts_CellId_CGI(hexstring mcc, hexstring mnc, BssmapLAC lac, BssmapCI ci)
 modifies ts_BSSMAP_IE_CellID := {
 	cellIdentification := {
-		cI_LAC_CGI := {
-			mnc_mcc := FIXME,
-			lac := int2oct(lac, 2),
-			ci := int2oct(ci, 2)
-		}
+		cI_CGI := ts_BSSMAP_CI_CGI(mcc, mnc, lac, ci)
 	}
 }
-*/
 
 template BSSMAP_IE_CellIdentifier ts_CellID_LAC_CI(BssmapLAC lac, BssmapCI ci)
 modifies ts_BSSMAP_IE_CellID := {