diff --git a/matlab/TCV_IMAS/tcv_get_ids_summary.m b/matlab/TCV_IMAS/tcv_get_ids_summary.m
index 7c44e77859f74fa0eafc83f45bbd77590e450d24..0afcb6cc1df3c0cfe1fbcaf2f93baac3b0663bc0 100644
--- a/matlab/TCV_IMAS/tcv_get_ids_summary.m
+++ b/matlab/TCV_IMAS/tcv_get_ids_summary.m
@@ -250,18 +250,12 @@ for i=1:numel(global_quantities_fieldnames)
   if ~any(strcmp(global_quantities_fieldnames{i},special_fields))
     if ~isstruct(ids_summary.global_quantities.(global_quantities_fieldnames{i}).value) && ...
         ~isempty(global_quantities.(global_quantities_fieldnames{i}).data)
-      % setup mask to get rid of nans
-      mask = ~isnan(global_quantities.(global_quantities_fieldnames{i}).data);
-      % assign a flat 1 to the array if it is all nans
-      if all(mask(:) == 0)
-	fprintf('Warning, %s is filled with NaNs, substituting 1\n', global_quantities_fieldnames{i});
-        global_quantities.(global_quantities_fieldnames{i}).data(:)=1;
-	mask(:)=1;
-      end
+      %Use interpos_nan to get rid of nans. Arrays will be empty if filled with nans
       ids_summary.global_quantities.(global_quantities_fieldnames{i}).value = ...
-        interpos(21,global_quantities.(global_quantities_fieldnames{i}).t(mask),...
-        global_quantities.(global_quantities_fieldnames{i}).data(mask), ...
+        interpos_nan(21,global_quantities.(global_quantities_fieldnames{i}).t,...
+        global_quantities.(global_quantities_fieldnames{i}).data, ...
           ids_summary.time);
+
       ids_summary.global_quantities.(global_quantities_fieldnames{i}).source = ['gdat request: ' global_quantities_desc.(global_quantities_fieldnames{i})];
     elseif ~isempty(global_quantities.(global_quantities_fieldnames{i}).data)
       special_fields{end+1} = global_quantities_fieldnames{i};