diff --git a/library/CBSP_Templates.ttcn b/library/CBSP_Templates.ttcn
index 2283e6f..7c73d7c 100644
--- a/library/CBSP_Templates.ttcn
+++ b/library/CBSP_Templates.ttcn
@@ -375,7 +375,9 @@
 	} else if (not istemplatekind(cell_list, "omit")) {
 		ies[lengthof(ies)] := tr_CbspCellList(cell_list);
 	}
-	ies[lengthof(ies)] := tr_CbspChannelInd(channel_ind);
+	if (not istemplatekind(channel_ind, "omit")) {
+		ies[lengthof(ies)] := tr_CbspChannelInd(channel_ind);
+	}
 	return tr_CBSP(CBSP_MSGT_WRITE_REPLACE_COMPL, ies);
 }
 
@@ -416,7 +418,9 @@
 	} else if (not istemplatekind(cell_list, "omit")) {
 		ies[lengthof(ies)] := tr_CbspCellList(cell_list);
 	}
-	ies[lengthof(ies)] := tr_CbspChannelInd(channel_ind);
+	if (not istemplatekind(channel_ind, "omit")) {
+		ies[lengthof(ies)] := tr_CbspChannelInd(channel_ind);
+	}
 	return tr_CBSP(CBSP_MSGT_WRITE_REPLACE_COMPL, ies);
 }
 
@@ -467,7 +471,9 @@
 	} else if (not istemplatekind(cell_list, "omit")) {
 		ies[lengthof(ies)] := tr_CbspCellList(cell_list);
 	}
-	ies[lengthof(ies)] := ts_CbspChannelInd(channel_ind);
+	if (not istemplatekind(channel_ind, "omit")) {
+		ies[lengthof(ies)] := ts_CbspChannelInd(channel_ind);
+	}
 	return tr_CBSP(CBSP_MSGT_WRITE_REPLACE_FAIL, ies);
 }