diff --git a/crpptbx/AUG/gdat_aug.m b/crpptbx/AUG/gdat_aug.m
index 3f9caaf6daf6aed7b5a080acb7e212d74f75cd50..2b37df269a4b15015328037987db14c8cbe0d710 100644
--- a/crpptbx/AUG/gdat_aug.m
+++ b/crpptbx/AUG/gdat_aug.m
@@ -931,9 +931,9 @@ elseif strcmp(mapping_for_aug.method,'switchcase')
       Lpf1 = Lpf1_t(it);
       % Qpsi and similar data is on (time,radius) with radius being: LCFS..Lpf_points dummy LCFS..SOL part
       % change it to (radial,time) and use only Lpf+1 points up to LCFS
-      ijok=find(qpsi.value(:,1)); % note: eqr fills in only odd points radially
+      ijok=find(abs(qpsi.value)>0); % note: eqr fills in only odd points radially
       % set NaNs to zeroes
-      if qpsi.value(ijok(1),1)<0
+      if qpsi.value(ijok(1))<0
 	gdat_data.qvalue(:,it) = max(qpsi.value(it,Lpf1:-1:1)',-max_qValue);
       else
 	gdat_data.qvalue(:,it) = min(qpsi.value(it,Lpf1:-1:1)',max_qValue);