diff --git a/crpptbx/gdat.m b/crpptbx/gdat.m
index 2896af794d79ef0354fb1f659ddf016be0d2ef3f..65e2483da2366bd7753d847350f882ff19abf774 100644
--- a/crpptbx/gdat.m
+++ b/crpptbx/gdat.m
@@ -69,10 +69,10 @@ if nargin>2
   if nargin>=3 && nargin<=4  && isnumeric(shot) && isnumeric(varargin{1})
     % assume old call: gdat(shot,'data_request',doplot[,machine])
     varargin_eff{1} = 'doplot';
-    varargin_eff{end+1} = varargin{1};
+    varargin_eff{2} = varargin{1};
     if nargin==4
-      varargin_eff{end+1} = 'machine';
-      varargin_eff{end+1} = varargin{2};
+      varargin_eff{3} = 'machine';
+      varargin_eff{4} = varargin{2};
     end
   end
 end
@@ -119,7 +119,7 @@ end
 % add only given machine directory using machine_eff...
 gdat_path = mfilename('fullpath');
 eval(['addpath ' gdat_path(1:end-4) upper(machine_eff)]);
-
+    
 % copy gdat present call:
 gdat_call = [];
 if nargin==0
@@ -175,7 +175,7 @@ catch ME_gdat
   end
   return
 end
-
+  
 gdat_data.gdat_call = gdat_call;
 
 if gdat_data.gdat_params.doplot