diff --git a/base/comm/internals/psi_cswapdata.F90 b/base/comm/internals/psi_cswapdata.F90
index 4d6be418..54de16ae 100644
--- a/base/comm/internals/psi_cswapdata.F90
+++ b/base/comm/internals/psi_cswapdata.F90
@@ -92,7 +92,7 @@
 submodule (psi_c_comm_v_mod)  psi_c_swapdata_impl
   use psb_base_mod
 contains
-  subroutine psi_cswapdata_vect(flag,beta,y,desc_a,work,info,data)
+  module subroutine psi_cswapdata_vect(flag,beta,y,desc_a,work,info,data)
 
 #ifdef PSB_MPI_MOD
     use mpi
diff --git a/base/comm/internals/psi_dswapdata.F90 b/base/comm/internals/psi_dswapdata.F90
index 890cfc30..2ee44807 100644
--- a/base/comm/internals/psi_dswapdata.F90
+++ b/base/comm/internals/psi_dswapdata.F90
@@ -92,7 +92,7 @@
 submodule (psi_d_comm_v_mod)  psi_d_swapdata_impl
   use psb_base_mod
 contains
-  subroutine psi_dswapdata_vect(flag,beta,y,desc_a,work,info,data)
+  module subroutine psi_dswapdata_vect(flag,beta,y,desc_a,work,info,data)
 
 #ifdef PSB_MPI_MOD
     use mpi
diff --git a/base/comm/internals/psi_iswapdata.F90 b/base/comm/internals/psi_iswapdata.F90
index 23c6d1da..38ceee87 100644
--- a/base/comm/internals/psi_iswapdata.F90
+++ b/base/comm/internals/psi_iswapdata.F90
@@ -92,7 +92,7 @@
 submodule (psi_i_comm_v_mod)  psi_i_swapdata_impl
   use psb_base_mod
 contains
-  subroutine psi_iswapdata_vect(flag,beta,y,desc_a,work,info,data)
+  module subroutine psi_iswapdata_vect(flag,beta,y,desc_a,work,info,data)
 
 #ifdef PSB_MPI_MOD
     use mpi
diff --git a/base/comm/internals/psi_lswapdata.F90 b/base/comm/internals/psi_lswapdata.F90
index 7d9e13a4..017590bb 100644
--- a/base/comm/internals/psi_lswapdata.F90
+++ b/base/comm/internals/psi_lswapdata.F90
@@ -92,7 +92,7 @@
 submodule (psi_l_comm_v_mod)  psi_l_swapdata_impl
   use psb_base_mod
 contains
-  subroutine psi_lswapdata_vect(flag,beta,y,desc_a,work,info,data)
+  module subroutine psi_lswapdata_vect(flag,beta,y,desc_a,work,info,data)
 
 #ifdef PSB_MPI_MOD
     use mpi
diff --git a/base/comm/internals/psi_sswapdata.F90 b/base/comm/internals/psi_sswapdata.F90
index bd3e6992..6c947fd7 100644
--- a/base/comm/internals/psi_sswapdata.F90
+++ b/base/comm/internals/psi_sswapdata.F90
@@ -92,7 +92,7 @@
 submodule (psi_s_comm_v_mod)  psi_s_swapdata_impl
   use psb_base_mod
 contains
-  subroutine psi_sswapdata_vect(flag,beta,y,desc_a,work,info,data)
+  module subroutine psi_sswapdata_vect(flag,beta,y,desc_a,work,info,data)
 
 #ifdef PSB_MPI_MOD
     use mpi
diff --git a/base/comm/internals/psi_zswapdata.F90 b/base/comm/internals/psi_zswapdata.F90
index 93fc1edf..2f9b89c3 100644
--- a/base/comm/internals/psi_zswapdata.F90
+++ b/base/comm/internals/psi_zswapdata.F90
@@ -92,7 +92,7 @@
 submodule (psi_z_comm_v_mod)  psi_z_swapdata_impl
   use psb_base_mod
 contains
-  subroutine psi_zswapdata_vect(flag,beta,y,desc_a,work,info,data)
+  module subroutine psi_zswapdata_vect(flag,beta,y,desc_a,work,info,data)
 
 #ifdef PSB_MPI_MOD
     use mpi