diff --git a/src/auxval.F90 b/src/auxval.F90
index 3718c678eba0738fee768a410e282bc4640758bc..7d6fd969feaa1e1c98888118650c5604f9bc583e 100644
--- a/src/auxval.F90
+++ b/src/auxval.F90
@@ -15,9 +15,11 @@ subroutine auxval
   IF (my_id .EQ. 0) WRITE(*,*) '=== Set auxiliary values ==='
 
   IF (LINEARITY .NE. 'linear') THEN
+    write(*,*) 'FFTW3 y-grid distribution'
     CALL init_grid_distr_and_plans(Nx,Ny)
   ELSE
     CALL init_1Dgrid_distr
+    write(*,*) 'Manual y-grid distribution'
   ENDIF
   ! Init the grids
   CALL set_pgrid ! parallel kin (MPI distributed)
diff --git a/src/fourier_mod.F90 b/src/fourier_mod.F90
index a64aa5011b82edcbf80bfb7bded95d2e3e2ba0e0..626ae05248db3c3574e3d9afb3ba26fa77e10440 100644
--- a/src/fourier_mod.F90
+++ b/src/fourier_mod.F90
@@ -42,6 +42,7 @@ MODULE fourier
     !! Complex arrays F, G
     ! Compute the room to allocate
     alloc_local_1 = fftw_mpi_local_size_2d(NY_halved, NX_, communicator, local_nky, local_nky_offset)
+
     ! Initalize pointers to this room
     cdatac_f = fftw_alloc_complex(alloc_local_1)
     cdatac_g = fftw_alloc_complex(alloc_local_1)
@@ -53,7 +54,7 @@ MODULE fourier
 
     !! Real arrays iFFT(F), iFFT(G)
     ! Compute the room to allocate
-    alloc_local_2 = fftw_mpi_local_size_2d(NX_, NY_halved, communicator, local_nky, local_nky_offset)
+    alloc_local_2 = fftw_mpi_local_size_2d(NY_halved, NX_, communicator, local_nky, local_nky_offset)
     ! Initalize pointers to this room
     cdatar_f = fftw_alloc_real(2*alloc_local_2)
     cdatar_g = fftw_alloc_real(2*alloc_local_2)
@@ -84,9 +85,9 @@ MODULE fourier
     ! First term df/dx x dg/dy
     DO ikx = ikxs, ikxe
       DO iky = ikys, ikye
-        cmpx_data_f(iky-local_nky_offset,ikx) = &
+        cmpx_data_f(ikx,iky-local_nky_offset) = &
               imagu*kxarray(ikx)*F_(iky,ikx)*AA_x(ikx)*AA_y(iky) !Anti aliasing filter
-        cmpx_data_g(iky-local_nky_offset,ikx) = &
+        cmpx_data_g(ikx,iky-local_nky_offset) = &
               imagu*kyarray(iky)*G_(iky,ikx)*AA_x(ikx)*AA_y(iky) !Anti aliasing filter
       ENDDO
     ENDDO
diff --git a/src/srcinfo.h b/src/srcinfo.h
index f43187152d078131b759b562d89a3c40eaf51291..690578d034de2e4a918e524c06036ee19d822ba9 100644
--- a/src/srcinfo.h
+++ b/src/srcinfo.h
@@ -3,8 +3,8 @@ character(len=40) BRANCH
 character(len=20) AUTHOR
 character(len=40) EXECDATE
 character(len=40) HOST
-parameter (VERSION='b4318b5-dirty')
+parameter (VERSION='e4c9228-dirty')
 parameter (BRANCH='kx_pos_plane')
 parameter (AUTHOR='ahoffman')
-parameter (EXECDATE='Fri Apr 29 18:36:06 CEST 2022')
+parameter (EXECDATE='Mon May 2 09:30:54 CEST 2022')
 parameter (HOST ='spcpc606')
diff --git a/src/srcinfo/srcinfo.h b/src/srcinfo/srcinfo.h
index f43187152d078131b759b562d89a3c40eaf51291..690578d034de2e4a918e524c06036ee19d822ba9 100644
--- a/src/srcinfo/srcinfo.h
+++ b/src/srcinfo/srcinfo.h
@@ -3,8 +3,8 @@ character(len=40) BRANCH
 character(len=20) AUTHOR
 character(len=40) EXECDATE
 character(len=40) HOST
-parameter (VERSION='b4318b5-dirty')
+parameter (VERSION='e4c9228-dirty')
 parameter (BRANCH='kx_pos_plane')
 parameter (AUTHOR='ahoffman')
-parameter (EXECDATE='Fri Apr 29 18:36:06 CEST 2022')
+parameter (EXECDATE='Mon May 2 09:30:54 CEST 2022')
 parameter (HOST ='spcpc606')