diff --git a/matlab/TCV/gdat_tcv.m b/matlab/TCV/gdat_tcv.m
index 3c6c80b63b693be1fcfa2b1aa2486134eb29f0a8..7785b4c9d5b124e62a86e50067980d70da5cc2bd 100644
--- a/matlab/TCV/gdat_tcv.m
+++ b/matlab/TCV/gdat_tcv.m
@@ -2438,7 +2438,7 @@ elseif strcmp(mapping_for_tcv.method,'switchcase')
     gdat_data.label={'P_{ohm}'};
     gdat_data.units = 'W';
     %
-    if any(strmatch('ec',gdat_data.gdat_params.source))
+    if any(strncmp('ec',gdat_data.gdat_params.source))
       % EC
       nodenameeff='\results::toray.input:p_gyro';
       tracetdi=tdi(nodenameeff);
@@ -2462,7 +2462,7 @@ elseif strcmp(mapping_for_tcv.method,'switchcase')
       end
     end
     %
-    if any(strmatch('nbi1',gdat_data.gdat_params.source))
+    if any(strncmp('nbi1',gdat_data.gdat_params.source))
       nodenameeff = '\results::NBH:POWR_TCV';
       nbh_data_tdi = tdi(nodenameeff);
       if ~isempty(nbh_data_tdi.data) && ~ischar(nbh_data_tdi.data) && ~isempty(nbh_data_tdi.dim)
@@ -2491,7 +2491,7 @@ elseif strcmp(mapping_for_tcv.method,'switchcase')
     end
     %
     index_rad = [];
-    if any(strmatch('rad',gdat_data.gdat_params.source))
+    if any(strncmp('rad',gdat_data.gdat_params.source))
       % RAD
       nodenameeff='\results::bolo:prad:total';
       tracetdi=tdi(nodenameeff);
@@ -2514,7 +2514,7 @@ elseif strcmp(mapping_for_tcv.method,'switchcase')
       end
     end
     %
-    if any(strmatch('nbi2',gdat_data.gdat_params.source))
+    if any(strncmp('nbi2',gdat_data.gdat_params.source))
     % NB2  
     nodenameeff = '\results::NB2:POWR_TCV';
       nb2_data_tdi = tdi(nodenameeff);
@@ -2542,7 +2542,7 @@ elseif strcmp(mapping_for_tcv.method,'switchcase')
         gdat_data.label{end+1}=gdat_data.nbi.label;
       end
     end
-    if any(strmatch('dnbi',gdat_data.gdat_params.source))
+    if any(strncmp('dnbi',gdat_data.gdat_params.source))
     % NB2  
     nodenameeff = '\RESULTS::DNBI:POWR_TCV';
       nb2_data_tdi = tdi(nodenameeff);