diff --git a/base/modules/tools/psb_c_tools_mod.f90 b/base/modules/tools/psb_c_tools_mod.f90
index 3512c71f..e31ef96a 100644
--- a/base/modules/tools/psb_c_tools_mod.f90
+++ b/base/modules/tools/psb_c_tools_mod.f90
@@ -260,7 +260,7 @@ Module psb_c_tools_mod
       logical, intent(in), optional        :: rebuild
       logical, intent(in), optional        :: local
     end subroutine psb_cspins
-    subroutine psb_cspins_csr_lirp(nr,irw,irp,ja,val,a,desc_a,info,rebuild,local)
+    subroutine psb_cspins_csr_lirp(nr,irp,ja,val,irw,a,desc_a,info,rebuild,local)
       import
       implicit none
       type(psb_desc_type), intent(inout)     :: desc_a
diff --git a/base/modules/tools/psb_d_tools_mod.f90 b/base/modules/tools/psb_d_tools_mod.f90
index 831559c5..971fc6b9 100644
--- a/base/modules/tools/psb_d_tools_mod.f90
+++ b/base/modules/tools/psb_d_tools_mod.f90
@@ -260,7 +260,7 @@ Module psb_d_tools_mod
       logical, intent(in), optional        :: rebuild
       logical, intent(in), optional        :: local
     end subroutine psb_dspins
-    subroutine psb_dspins_csr_lirp(nr,irw,irp,ja,val,a,desc_a,info,rebuild,local)
+    subroutine psb_dspins_csr_lirp(nr,irp,ja,val,irw,a,desc_a,info,rebuild,local)
       import
       implicit none
       type(psb_desc_type), intent(inout)     :: desc_a
diff --git a/base/modules/tools/psb_s_tools_mod.f90 b/base/modules/tools/psb_s_tools_mod.f90
index 27b3df4d..155a39d0 100644
--- a/base/modules/tools/psb_s_tools_mod.f90
+++ b/base/modules/tools/psb_s_tools_mod.f90
@@ -260,7 +260,7 @@ Module psb_s_tools_mod
       logical, intent(in), optional        :: rebuild
       logical, intent(in), optional        :: local
     end subroutine psb_sspins
-    subroutine psb_sspins_csr_lirp(nr,irw,irp,ja,val,a,desc_a,info,rebuild,local)
+    subroutine psb_sspins_csr_lirp(nr,irp,ja,val,irw,a,desc_a,info,rebuild,local)
       import
       implicit none
       type(psb_desc_type), intent(inout)     :: desc_a
diff --git a/base/modules/tools/psb_z_tools_mod.f90 b/base/modules/tools/psb_z_tools_mod.f90
index 900fe06a..565ff8d1 100644
--- a/base/modules/tools/psb_z_tools_mod.f90
+++ b/base/modules/tools/psb_z_tools_mod.f90
@@ -260,7 +260,7 @@ Module psb_z_tools_mod
       logical, intent(in), optional        :: rebuild
       logical, intent(in), optional        :: local
     end subroutine psb_zspins
-    subroutine psb_zspins_csr_lirp(nr,irw,irp,ja,val,a,desc_a,info,rebuild,local)
+    subroutine psb_zspins_csr_lirp(nr,irp,ja,val,irw,a,desc_a,info,rebuild,local)
       import
       implicit none
       type(psb_desc_type), intent(inout)     :: desc_a
diff --git a/base/tools/psb_cspins.f90 b/base/tools/psb_cspins.f90
index 914b088e..c17c1409 100644
--- a/base/tools/psb_cspins.f90
+++ b/base/tools/psb_cspins.f90
@@ -191,7 +191,7 @@ subroutine psb_cspins(nz,ia,ja,val,a,desc_a,info,rebuild,local)
 
 end subroutine psb_cspins
 
-subroutine psb_cspins_csr_lirp(nr,irw,irp,ja,val,a,desc_a,info,rebuild,local)
+subroutine psb_cspins_csr_lirp(nr,irp,ja,val,irw,a,desc_a,info,rebuild,local)
   use psb_base_mod, psb_protect_name => psb_cspins_csr_lirp
   use psi_mod
   implicit none
diff --git a/base/tools/psb_dspins.f90 b/base/tools/psb_dspins.f90
index 6069a5cd..b774358b 100644
--- a/base/tools/psb_dspins.f90
+++ b/base/tools/psb_dspins.f90
@@ -191,7 +191,7 @@ subroutine psb_dspins(nz,ia,ja,val,a,desc_a,info,rebuild,local)
 
 end subroutine psb_dspins
 
-subroutine psb_dspins_csr_lirp(nr,irw,irp,ja,val,a,desc_a,info,rebuild,local)
+subroutine psb_dspins_csr_lirp(nr,irp,ja,val,irw,a,desc_a,info,rebuild,local)
   use psb_base_mod, psb_protect_name => psb_dspins_csr_lirp
   use psi_mod
   implicit none
diff --git a/base/tools/psb_sspins.f90 b/base/tools/psb_sspins.f90
index 653b75ed..e1cea619 100644
--- a/base/tools/psb_sspins.f90
+++ b/base/tools/psb_sspins.f90
@@ -191,7 +191,7 @@ subroutine psb_sspins(nz,ia,ja,val,a,desc_a,info,rebuild,local)
 
 end subroutine psb_sspins
 
-subroutine psb_sspins_csr_lirp(nr,irw,irp,ja,val,a,desc_a,info,rebuild,local)
+subroutine psb_sspins_csr_lirp(nr,irp,ja,val,irw,a,desc_a,info,rebuild,local)
   use psb_base_mod, psb_protect_name => psb_sspins_csr_lirp
   use psi_mod
   implicit none
diff --git a/base/tools/psb_zspins.f90 b/base/tools/psb_zspins.f90
index 09233ecf..f7129ce5 100644
--- a/base/tools/psb_zspins.f90
+++ b/base/tools/psb_zspins.f90
@@ -191,7 +191,7 @@ subroutine psb_zspins(nz,ia,ja,val,a,desc_a,info,rebuild,local)
 
 end subroutine psb_zspins
 
-subroutine psb_zspins_csr_lirp(nr,irw,irp,ja,val,a,desc_a,info,rebuild,local)
+subroutine psb_zspins_csr_lirp(nr,irp,ja,val,irw,a,desc_a,info,rebuild,local)
   use psb_base_mod, psb_protect_name => psb_zspins_csr_lirp
   use psi_mod
   implicit none