diff --git a/library/CBSP_Templates.ttcn b/library/CBSP_Templates.ttcn
index 8d6274270..5ee1f33bf 100644
--- a/library/CBSP_Templates.ttcn
+++ b/library/CBSP_Templates.ttcn
@@ -354,7 +354,7 @@ return template (value) CBSP_PDU {
 		ts_NewSerNo(new_ser_nr)
 	};
 	if (not istemplatekind(cell_list, "omit")) {
-		ies[lengthof(ies)] := ts_CbspCellList(cell_list);
+		ies[lengthof(ies)] := ts_CbspCellList(valueof(cell_list));
 	}
 	ies[lengthof(ies)] := ts_CbspChannelInd(channel_ind);
 	return ts_CBSP(CBSP_MSGT_WRITE_REPLACE_COMPL, ies);
@@ -394,7 +394,7 @@ return template (value) CBSP_PDU {
 		ts_CbspNumComplList(compl_list)
 	};
 	if (not istemplatekind(cell_list, "omit")) {
-		ies[lengthof(ies)] := ts_CbspCellList(cell_list);
+		ies[lengthof(ies)] := ts_CbspCellList(valueof(cell_list));
 	}
 	ies[lengthof(ies)] := ts_CbspChannelInd(channel_ind);
 	return ts_CBSP(CBSP_MSGT_WRITE_REPLACE_COMPL, ies);
@@ -439,10 +439,10 @@ return template (value) CBSP_PDU {
 		ts_CbspFailList(fail_list)
 	};
 	if (not istemplatekind(compl_list, "omit")) {
-		ies[lengthof(ies)] := ts_CbspNumComplList(compl_list);
+		ies[lengthof(ies)] := ts_CbspNumComplList(valueof(compl_list));
 	}
 	if (not istemplatekind(cell_list, "omit")) {
-		ies[lengthof(ies)] := ts_CbspCellList(cell_list);
+		ies[lengthof(ies)] := ts_CbspCellList(valueof(cell_list));
 	}
 	ies[lengthof(ies)] := ts_CbspChannelInd(channel_ind);
 	return ts_CBSP(CBSP_MSGT_WRITE_REPLACE_FAIL, ies);
@@ -493,10 +493,10 @@ return template (value) CBSP_PDU {
 		ts_CbspFailList(fail_list)
 	};
 	if (not istemplatekind(compl_list, "omit")) {
-		ies[lengthof(ies)] := ts_CbspNumComplList(compl_list);
+		ies[lengthof(ies)] := ts_CbspNumComplList(valueof(compl_list));
 	}
 	if (not istemplatekind(cell_list, "omit")) {
-		ies[lengthof(ies)] := ts_CbspCellList(cell_list);
+		ies[lengthof(ies)] := ts_CbspCellList(valueof(cell_list));
 	}
 	ies[lengthof(ies)] := ts_CbspChannelInd(channel_ind);
 	return ts_CBSP(CBSP_MSGT_WRITE_REPLACE_FAIL, ies);
@@ -562,10 +562,10 @@ return template (value) CBSP_PDU {
 		ts_OldSerNo(old_ser_nr)
 	};
 	if (not istemplatekind(compl_list, "omit")) {
-		ies[lengthof(ies)] := ts_CbspNumComplList(compl_list);
+		ies[lengthof(ies)] := ts_CbspNumComplList(valueof(compl_list));
 	}
 	if (not istemplatekind(cell_list, "omit")) {
-		ies[lengthof(ies)] := ts_CbspCellList(cell_list);
+		ies[lengthof(ies)] := ts_CbspCellList(valueof(cell_list));
 	}
 	if (not istemplatekind(channel_ind, "omit")) {
 		ies[lengthof(ies)] := ts_CbspChannelInd(channel_ind);
@@ -621,10 +621,10 @@ return template (value) CBSP_PDU {
 		ts_CbspFailList(fail_list)
 	};
 	if (not istemplatekind(compl_list, "omit")) {
-		ies[lengthof(ies)] := ts_CbspNumComplList(compl_list);
+		ies[lengthof(ies)] := ts_CbspNumComplList(valueof(compl_list));
 	}
 	if (not istemplatekind(cell_list, "omit")) {
-		ies[lengthof(ies)] := ts_CbspCellList(cell_list);
+		ies[lengthof(ies)] := ts_CbspCellList(valueof(cell_list));
 	}
 	if (not istemplatekind(channel_ind, "omit")) {
 		ies[lengthof(ies)] := ts_CbspChannelInd(channel_ind);