diff --git a/JET/geteqdskJET.m b/JET/geteqdskJET.m
index 58df56e254724aa08127fc43e26839a5957c4672..3b08e1d402cda874771f9fed88734c4f8a2dcc1d 100644
--- a/JET/geteqdskJET.m
+++ b/JET/geteqdskJET.m
@@ -97,6 +97,9 @@ if iread==1
   efitdata.xli=gdat(shot,['ppf/' efitlab '/xli' s_extra],0,'JET');
   efitdata.sspr=gdat(shot,['ppf/' efitlab '/sspr' s_extra],0,'JET');
   efitdata.sspi=gdat(shot,['ppf/' efitlab '/sspi' s_extra],0,'JET');
+  efitdata.ti=gdat(shot,['ppf/TION/TI' s_extra],0,'JET');
+  efitdata.pi=gdat(shot,['ppf/NION/DD' s_extra],0,'JET');
+  efitdata.zef=gdat(shot,['ppf/NION/ZEF' s_extra],0,'JET');
 end
 
 tefit=efitdata.tefit;
@@ -125,12 +128,12 @@ P=efitdata.P.data(:,index_efit);
 Q=efitdata.Q.data(:,index_efit);
 kappa=efitdata.kappa.data(index_efit);
 q95=efitdata.q95.data(index_efit);
-btpd=efitdata.btpd.data(index_efit);
-bttd=efitdata.bttd.data(index_efit);
-btnd=efitdata.btnd.data(index_efit);
-btpm=efitdata.btpm.data(index_efit);
-bttm=efitdata.bttm.data(index_efit);
-btnm=efitdata.btnm.data(index_efit);
+if index_efit<=length(efitdata.btpd.data); btpd=efitdata.btpd.data(index_efit); else; btpd=0; end
+if index_efit<=length(efitdata.bttd.data); bttd=efitdata.bttd.data(index_efit); else; bttd=0; end
+if index_efit<=length(efitdata.btnd.data); btnd=efitdata.btnd.data(index_efit); else; btnd=0; end
+if index_efit<=length(efitdata.btpm.data); btpm=efitdata.btpm.data(index_efit); else; btpm=0; end
+if index_efit<=length(efitdata.bttm.data); bttm=efitdata.bttm.data(index_efit); else; bttm=0; end
+if index_efit<=length(efitdata.btnm.data); btnm=efitdata.btnm.data(index_efit); else; btnm=0; end
 xli=efitdata.xli.data(index_efit);
 
 [R,Z,psinrz]=psirz(shot,time,nrg,nzg,efitlab,uid,seqd,ncont,efitdata.sspr,efitdata.sspi,deltaz);