diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pineighbor_alltoallw_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pineighbor_alltoallw_f08.F90
index 99e6463648..8f33c1a60f 100644
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pineighbor_alltoallw_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/profile/pineighbor_alltoallw_f08.F90
@@ -15,15 +15,15 @@ subroutine PMPI_Ineighbor_alltoallw_f08(sendbuf,sendcounts,sdispls,sendtypes,&
    OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf, recvbuf
    INTEGER, INTENT(IN) :: sendcounts(*), recvcounts(*)
    INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: sdispls(*), rdispls(*)
-   TYPE(MPI_Datatype), INTENT(IN) :: sendtypes
-   TYPE(MPI_Datatype), INTENT(IN) :: recvtypes
+   TYPE(MPI_Datatype), INTENT(IN) :: sendtypes(*)
+   TYPE(MPI_Datatype), INTENT(IN) :: recvtypes(*)
    TYPE(MPI_Comm), INTENT(IN) :: comm
    TYPE(MPI_Request), INTENT(OUT) :: request
    INTEGER, OPTIONAL, INTENT(OUT) :: ierror
    integer :: c_ierror
 
-   call ompi_ineighbor_alltoallw_f(sendbuf,sendcounts,sdispls,sendtypes%MPI_VAL,&
-                                   recvbuf,recvcounts,rdispls,recvtypes%MPI_VAL,&
+   call ompi_ineighbor_alltoallw_f(sendbuf,sendcounts,sdispls,sendtypes(1)%MPI_VAL,&
+                                   recvbuf,recvcounts,rdispls,recvtypes(1)%MPI_VAL,&
                                    comm%MPI_VAL,request%MPI_VAL,c_ierror)
    if (present(ierror)) ierror = c_ierror
 
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pneighbor_alltoallw_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pneighbor_alltoallw_f08.F90
index 0e27aef216..e1a26ad871 100644
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pneighbor_alltoallw_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/profile/pneighbor_alltoallw_f08.F90
@@ -15,14 +15,14 @@ subroutine PMPI_Neighbor_alltoallw_f08(sendbuf,sendcounts,sdispls,sendtypes,&
    OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf, recvbuf
    INTEGER, INTENT(IN) :: sendcounts(*), recvcounts(*)
    INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: sdispls(*), rdispls(*)
-   TYPE(MPI_Datatype), INTENT(IN) :: sendtypes
-   TYPE(MPI_Datatype), INTENT(IN) :: recvtypes
+   TYPE(MPI_Datatype), INTENT(IN) :: sendtypes(*)
+   TYPE(MPI_Datatype), INTENT(IN) :: recvtypes(*)
    TYPE(MPI_Comm), INTENT(IN) :: comm
    INTEGER, OPTIONAL, INTENT(OUT) :: ierror
    integer :: c_ierror
 
-   call ompi_neighbor_alltoallw_f(sendbuf,sendcounts,sdispls,sendtypes%MPI_VAL,&
-                                  recvbuf,recvcounts,rdispls,recvtypes%MPI_VAL,&
+   call ompi_neighbor_alltoallw_f(sendbuf,sendcounts,sdispls,sendtypes(1)%MPI_VAL,&
+                                  recvbuf,recvcounts,rdispls,recvtypes(1)%MPI_VAL,&
                                   comm%MPI_VAL,c_ierror)
    if (present(ierror)) ierror = c_ierror