diff --git a/.gitignore b/.gitignore
index b073e43735..a96cbe7db0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,8 @@ nbproject
 vlsvdiff_DP
 vlsvextract_DP
 compile_commands.json
+libraries*/
+library-build/
+run_*/
+!run_tests.sh
+profile/
diff --git a/spatial_cells/spatial_cell_gpu.cpp b/spatial_cells/spatial_cell_gpu.cpp
index 606c0a6794..4d19b2ada6 100644
--- a/spatial_cells/spatial_cell_gpu.cpp
+++ b/spatial_cells/spatial_cell_gpu.cpp
@@ -1002,14 +1002,20 @@ namespace spatial_cell {
       MPI_Datatype datatype;
 
       if (displacements.size() > 0) {
-         count = 1;
-         MPI_Type_create_hindexed(
-            displacements.size(),
-            &block_lengths[0],
-            &displacements[0],
-            MPI_BYTE,
-            &datatype
-         );
+         if (displacements.size() == 1) {
+            address = address + displacements[0];
+            count = block_lengths[0];
+            datatype = MPI_BYTE;
+         } else {
+            count = 1;
+            MPI_Type_create_hindexed(
+               displacements.size(),
+               &block_lengths[0],
+               &displacements[0],
+               MPI_BYTE,
+               &datatype
+            );
+         }
       } else {
          count = 0;
          datatype = MPI_BYTE;