diff --git a/base/internals/psi_idx_cnv.f90 b/base/internals/psi_idx_cnv.f90
index e89fcd5f..66a8cad7 100644
--- a/base/internals/psi_idx_cnv.f90
+++ b/base/internals/psi_idx_cnv.f90
@@ -240,9 +240,10 @@ subroutine psi_idx_cnv2(nv,idxin,idxout,desc,info,mask,owned)
     goto 9999
   end if
 
-  idxout(1:nv) = idxin(1:nv) 
-  call psi_idx_cnv1(nv,idxout,desc,info,mask=mask,owned=owned)  
-
+!!$  idxout(1:nv) = idxin(1:nv) 
+!!$  call psi_idx_cnv1(nv,idxout,desc,info,mask=mask,owned=owned)  
+  call desc%indxmap%g2l(idxin(1:nv),idxout(1:nv),info,mask=mask,owned=owned)
+  
   call psb_erractionrestore(err_act)
   return
 
diff --git a/base/internals/psi_idx_ins_cnv.f90 b/base/internals/psi_idx_ins_cnv.f90
index d3ba24c6..50ec4277 100644
--- a/base/internals/psi_idx_ins_cnv.f90
+++ b/base/internals/psi_idx_ins_cnv.f90
@@ -244,9 +244,10 @@ subroutine psi_idx_ins_cnv2(nv,idxin,idxout,desc,info,mask,lidx)
     call psb_errpush(info,name)
     goto 9999
   end if
-
-  idxout(1:nv) = idxin(1:nv)
-  call psi_idx_ins_cnv(nv,idxout,desc,info,mask=mask,lidx=lidx)
+  
+!!$  idxout(1:nv) = idxin(1:nv)
+!!$  call psi_idx_ins_cnv(nv,idxout,desc,info,mask=mask,lidx=lidx)
+  call desc%indxmap%g2l_ins(idxin(1:nv),idxout(1:nv),info,mask=mask,lidx=lidx)
 
   call psb_erractionrestore(err_act)
   return