diff --git a/base/serial/impl/psb_c_coo_impl.f90 b/base/serial/impl/psb_c_coo_impl.f90
index 55bcd1710..511faba7a 100644
--- a/base/serial/impl/psb_c_coo_impl.f90
+++ b/base/serial/impl/psb_c_coo_impl.f90
@@ -405,12 +405,11 @@ subroutine psb_c_coo_print(iout,a,iv,head,ivr,ivc)
   character(len=80)                 :: frmtv 
   integer(psb_ipk_) :: i,j, nmx, ni, nr, nc, nz
 
-  if (present(head)) then 
-    write(iout,'(a)') '%%MatrixMarket matrix coordinate complex general'
-    write(iout,'(a,a)') '% ',head 
-    write(iout,'(a)') '%'    
-    write(iout,'(a,a)') '% COO'
-  endif
+
+  write(iout,'(a)') '%%MatrixMarket matrix coordinate complex general'
+  if (present(head)) write(iout,'(a,a)') '% ',head 
+  write(iout,'(a)') '%'    
+  write(iout,'(a,a)') '% COO'
 
   nr = a%get_nrows()
   nc = a%get_ncols()
diff --git a/base/serial/impl/psb_c_csc_impl.f90 b/base/serial/impl/psb_c_csc_impl.f90
index fc463cf12..dabbfea49 100644
--- a/base/serial/impl/psb_c_csc_impl.f90
+++ b/base/serial/impl/psb_c_csc_impl.f90
@@ -2735,12 +2735,10 @@ subroutine psb_c_csc_print(iout,a,iv,head,ivr,ivc)
   character(len=80)                 :: frmtv 
   integer(psb_ipk_) :: i,j, nmx, ni, nr, nc, nz
 
-  if (present(head)) then 
-    write(iout,'(a)') '%%MatrixMarket matrix coordinate complex general'
-    write(iout,'(a,a)') '% ',head 
-    write(iout,'(a)') '%'    
-    write(iout,'(a,a)') '% COO'
-  endif
+  write(iout,'(a)') '%%MatrixMarket matrix coordinate complex general'
+  if (present(head)) write(iout,'(a,a)') '% ',head 
+  write(iout,'(a)') '%'    
+  write(iout,'(a,a)') '% COO'
 
   nr = a%get_nrows()
   nc = a%get_ncols()
diff --git a/base/serial/impl/psb_c_csr_impl.f90 b/base/serial/impl/psb_c_csr_impl.f90
index 4973cc801..887358ebb 100644
--- a/base/serial/impl/psb_c_csr_impl.f90
+++ b/base/serial/impl/psb_c_csr_impl.f90
@@ -2592,13 +2592,11 @@ subroutine psb_c_csr_print(iout,a,iv,head,ivr,ivc)
   character(len=*), parameter  :: datatype='complex'
   character(len=80)                 :: frmtv 
   integer(psb_ipk_) :: irs,ics,i,j, nmx, ni, nr, nc, nz
-
-  if (present(head)) then 
-    write(iout,'(a)') '%%MatrixMarket matrix coordinate complex general'
-    write(iout,'(a,a)') '% ',head 
-    write(iout,'(a)') '%'    
-    write(iout,'(a,a)') '% COO'
-  endif
+  
+  write(iout,'(a)') '%%MatrixMarket matrix coordinate complex general'
+  if (present(head)) write(iout,'(a,a)') '% ',head 
+  write(iout,'(a)') '%'    
+  write(iout,'(a,a)') '% COO'
 
   nr = a%get_nrows()
   nc = a%get_ncols()
diff --git a/base/serial/impl/psb_d_coo_impl.f90 b/base/serial/impl/psb_d_coo_impl.f90
index fd8741731..e33be37f3 100644
--- a/base/serial/impl/psb_d_coo_impl.f90
+++ b/base/serial/impl/psb_d_coo_impl.f90
@@ -405,12 +405,11 @@ subroutine psb_d_coo_print(iout,a,iv,head,ivr,ivc)
   character(len=80)                 :: frmtv 
   integer(psb_ipk_) :: i,j, nmx, ni, nr, nc, nz
 
-  if (present(head)) then 
-    write(iout,'(a)') '%%MatrixMarket matrix coordinate real general'
-    write(iout,'(a,a)') '% ',head 
-    write(iout,'(a)') '%'    
-    write(iout,'(a,a)') '% COO'
-  endif
+
+  write(iout,'(a)') '%%MatrixMarket matrix coordinate real general'
+  if (present(head)) write(iout,'(a,a)') '% ',head 
+  write(iout,'(a)') '%'    
+  write(iout,'(a,a)') '% COO'
 
   nr = a%get_nrows()
   nc = a%get_ncols()
diff --git a/base/serial/impl/psb_d_csc_impl.f90 b/base/serial/impl/psb_d_csc_impl.f90
index d346288ef..c29915b81 100644
--- a/base/serial/impl/psb_d_csc_impl.f90
+++ b/base/serial/impl/psb_d_csc_impl.f90
@@ -2735,12 +2735,10 @@ subroutine psb_d_csc_print(iout,a,iv,head,ivr,ivc)
   character(len=80)                 :: frmtv 
   integer(psb_ipk_) :: i,j, nmx, ni, nr, nc, nz
 
-  if (present(head)) then 
-    write(iout,'(a)') '%%MatrixMarket matrix coordinate real general'
-    write(iout,'(a,a)') '% ',head 
-    write(iout,'(a)') '%'    
-    write(iout,'(a,a)') '% COO'
-  endif
+  write(iout,'(a)') '%%MatrixMarket matrix coordinate real general'
+  if (present(head)) write(iout,'(a,a)') '% ',head 
+  write(iout,'(a)') '%'    
+  write(iout,'(a,a)') '% COO'
 
   nr = a%get_nrows()
   nc = a%get_ncols()
diff --git a/base/serial/impl/psb_d_csr_impl.f90 b/base/serial/impl/psb_d_csr_impl.f90
index 0213badc3..a419134f8 100644
--- a/base/serial/impl/psb_d_csr_impl.f90
+++ b/base/serial/impl/psb_d_csr_impl.f90
@@ -2592,13 +2592,11 @@ subroutine psb_d_csr_print(iout,a,iv,head,ivr,ivc)
   character(len=*), parameter  :: datatype='real'
   character(len=80)                 :: frmtv 
   integer(psb_ipk_) :: irs,ics,i,j, nmx, ni, nr, nc, nz
-
-  if (present(head)) then 
-    write(iout,'(a)') '%%MatrixMarket matrix coordinate real general'
-    write(iout,'(a,a)') '% ',head 
-    write(iout,'(a)') '%'    
-    write(iout,'(a,a)') '% COO'
-  endif
+  
+  write(iout,'(a)') '%%MatrixMarket matrix coordinate real general'
+  if (present(head)) write(iout,'(a,a)') '% ',head 
+  write(iout,'(a)') '%'    
+  write(iout,'(a,a)') '% COO'
 
   nr = a%get_nrows()
   nc = a%get_ncols()
diff --git a/base/serial/impl/psb_s_coo_impl.f90 b/base/serial/impl/psb_s_coo_impl.f90
index e06fc1480..4753fe570 100644
--- a/base/serial/impl/psb_s_coo_impl.f90
+++ b/base/serial/impl/psb_s_coo_impl.f90
@@ -405,12 +405,11 @@ subroutine psb_s_coo_print(iout,a,iv,head,ivr,ivc)
   character(len=80)                 :: frmtv 
   integer(psb_ipk_) :: i,j, nmx, ni, nr, nc, nz
 
-  if (present(head)) then 
-    write(iout,'(a)') '%%MatrixMarket matrix coordinate real general'
-    write(iout,'(a,a)') '% ',head 
-    write(iout,'(a)') '%'    
-    write(iout,'(a,a)') '% COO'
-  endif
+
+  write(iout,'(a)') '%%MatrixMarket matrix coordinate real general'
+  if (present(head)) write(iout,'(a,a)') '% ',head 
+  write(iout,'(a)') '%'    
+  write(iout,'(a,a)') '% COO'
 
   nr = a%get_nrows()
   nc = a%get_ncols()
diff --git a/base/serial/impl/psb_s_csc_impl.f90 b/base/serial/impl/psb_s_csc_impl.f90
index 46ffdfd2e..fbca91052 100644
--- a/base/serial/impl/psb_s_csc_impl.f90
+++ b/base/serial/impl/psb_s_csc_impl.f90
@@ -2735,12 +2735,10 @@ subroutine psb_s_csc_print(iout,a,iv,head,ivr,ivc)
   character(len=80)                 :: frmtv 
   integer(psb_ipk_) :: i,j, nmx, ni, nr, nc, nz
 
-  if (present(head)) then 
-    write(iout,'(a)') '%%MatrixMarket matrix coordinate real general'
-    write(iout,'(a,a)') '% ',head 
-    write(iout,'(a)') '%'    
-    write(iout,'(a,a)') '% COO'
-  endif
+  write(iout,'(a)') '%%MatrixMarket matrix coordinate real general'
+  if (present(head)) write(iout,'(a,a)') '% ',head 
+  write(iout,'(a)') '%'    
+  write(iout,'(a,a)') '% COO'
 
   nr = a%get_nrows()
   nc = a%get_ncols()
diff --git a/base/serial/impl/psb_s_csr_impl.f90 b/base/serial/impl/psb_s_csr_impl.f90
index 1a9e94123..aee06936f 100644
--- a/base/serial/impl/psb_s_csr_impl.f90
+++ b/base/serial/impl/psb_s_csr_impl.f90
@@ -2592,13 +2592,11 @@ subroutine psb_s_csr_print(iout,a,iv,head,ivr,ivc)
   character(len=*), parameter  :: datatype='real'
   character(len=80)                 :: frmtv 
   integer(psb_ipk_) :: irs,ics,i,j, nmx, ni, nr, nc, nz
-
-  if (present(head)) then 
-    write(iout,'(a)') '%%MatrixMarket matrix coordinate real general'
-    write(iout,'(a,a)') '% ',head 
-    write(iout,'(a)') '%'    
-    write(iout,'(a,a)') '% COO'
-  endif
+  
+  write(iout,'(a)') '%%MatrixMarket matrix coordinate real general'
+  if (present(head)) write(iout,'(a,a)') '% ',head 
+  write(iout,'(a)') '%'    
+  write(iout,'(a,a)') '% COO'
 
   nr = a%get_nrows()
   nc = a%get_ncols()
diff --git a/base/serial/impl/psb_z_coo_impl.f90 b/base/serial/impl/psb_z_coo_impl.f90
index cd9269595..d7136a129 100644
--- a/base/serial/impl/psb_z_coo_impl.f90
+++ b/base/serial/impl/psb_z_coo_impl.f90
@@ -405,12 +405,11 @@ subroutine psb_z_coo_print(iout,a,iv,head,ivr,ivc)
   character(len=80)                 :: frmtv 
   integer(psb_ipk_) :: i,j, nmx, ni, nr, nc, nz
 
-  if (present(head)) then 
-    write(iout,'(a)') '%%MatrixMarket matrix coordinate complex general'
-    write(iout,'(a,a)') '% ',head 
-    write(iout,'(a)') '%'    
-    write(iout,'(a,a)') '% COO'
-  endif
+
+  write(iout,'(a)') '%%MatrixMarket matrix coordinate complex general'
+  if (present(head)) write(iout,'(a,a)') '% ',head 
+  write(iout,'(a)') '%'    
+  write(iout,'(a,a)') '% COO'
 
   nr = a%get_nrows()
   nc = a%get_ncols()
diff --git a/base/serial/impl/psb_z_csc_impl.f90 b/base/serial/impl/psb_z_csc_impl.f90
index 4f4b3616d..858651f21 100644
--- a/base/serial/impl/psb_z_csc_impl.f90
+++ b/base/serial/impl/psb_z_csc_impl.f90
@@ -2735,12 +2735,10 @@ subroutine psb_z_csc_print(iout,a,iv,head,ivr,ivc)
   character(len=80)                 :: frmtv 
   integer(psb_ipk_) :: i,j, nmx, ni, nr, nc, nz
 
-  if (present(head)) then 
-    write(iout,'(a)') '%%MatrixMarket matrix coordinate complex general'
-    write(iout,'(a,a)') '% ',head 
-    write(iout,'(a)') '%'    
-    write(iout,'(a,a)') '% COO'
-  endif
+  write(iout,'(a)') '%%MatrixMarket matrix coordinate complex general'
+  if (present(head)) write(iout,'(a,a)') '% ',head 
+  write(iout,'(a)') '%'    
+  write(iout,'(a,a)') '% COO'
 
   nr = a%get_nrows()
   nc = a%get_ncols()
diff --git a/base/serial/impl/psb_z_csr_impl.f90 b/base/serial/impl/psb_z_csr_impl.f90
index 042e4158a..9131011fa 100644
--- a/base/serial/impl/psb_z_csr_impl.f90
+++ b/base/serial/impl/psb_z_csr_impl.f90
@@ -2592,13 +2592,11 @@ subroutine psb_z_csr_print(iout,a,iv,head,ivr,ivc)
   character(len=*), parameter  :: datatype='complex'
   character(len=80)                 :: frmtv 
   integer(psb_ipk_) :: irs,ics,i,j, nmx, ni, nr, nc, nz
-
-  if (present(head)) then 
-    write(iout,'(a)') '%%MatrixMarket matrix coordinate complex general'
-    write(iout,'(a,a)') '% ',head 
-    write(iout,'(a)') '%'    
-    write(iout,'(a,a)') '% COO'
-  endif
+  
+  write(iout,'(a)') '%%MatrixMarket matrix coordinate complex general'
+  if (present(head)) write(iout,'(a,a)') '% ',head 
+  write(iout,'(a)') '%'    
+  write(iout,'(a,a)') '% COO'
 
   nr = a%get_nrows()
   nc = a%get_ncols()