diff --git a/crpptbx/TCV/gdat_tcv.m b/crpptbx/TCV/gdat_tcv.m
index ce971e506cf27645cdd2eede1fe5f6314f360151..a860992cf6a5b70bc85d7284f6f3adf4bb7fb923 100644
--- a/crpptbx/TCV/gdat_tcv.m
+++ b/crpptbx/TCV/gdat_tcv.m
@@ -1475,9 +1475,7 @@ elseif strcmp(mapping_for_tcv.method,'switchcase')
               addpath('/home/carpanes/rtccode/development/tools/io_defs');
           end              
           
-
-          
-          sources_avail = {'defined'};
+          sources_avail = {'defined', 'all'};
           %Check if varargins match source_avail
           if ~isfield(gdat_data.gdat_params,'source') || isempty(gdat_data.gdat_params.source) % with no specifications all, defined, combined are taken
               gdat_data.gdat_params.source = sources_avail;
@@ -1513,8 +1511,6 @@ elseif strcmp(mapping_for_tcv.method,'switchcase')
               gdat_data.gdat_params.source = tmp;
           end
 
-            
-
                       
           % Get data for the source requested
           for ii=1:numel(gdat_data.gdat_params.source)
@@ -1598,7 +1594,7 @@ elseif strcmp(mapping_for_tcv.method,'switchcase')
                       % Default signals initialization
                       AS = init_all_signals(global_node_thread_signals);
                       
-                      % Put signals in standard data strucure (SDS)
+                      % Put signals in standard data strucure (SDS) 
                       SDS_AS = define_simulink_signals(AS);
                       
                       % Add the .data and .t structure
@@ -1614,7 +1610,7 @@ elseif strcmp(mapping_for_tcv.method,'switchcase')
                                   is_with_threads = 0;
                               end
                               
-                              for kk=1:numel(fieldnameslist) %iter over fieldnames
+                              for kk=2:numel(fieldnameslist) %iter over fieldnames (the  first one is configuration)
                                   
                                   indices = SDS_AS{ii}{jj}.(fieldnameslist{kk}).ind;
                                   SDS_AS{ii}{jj}.(fieldnameslist{kk}).data = [];