diff --git a/src/comm_tiled.cpp b/src/comm_tiled.cpp
index 849227983a..6930ad13e8 100644
--- a/src/comm_tiled.cpp
+++ b/src/comm_tiled.cpp
@@ -90,14 +90,13 @@ void CommTiled::init_buffers()
 
   maxoverlap = 0;
   overlap = NULL;
-
-  maxswap = 6;
-  allocate_swap(maxswap);
-
   rcbinfo = NULL;
-
   cutghostmulti = NULL;
   sendbox_multi = NULL;
+
+  maxswap = 6;
+  nswap = 2*domain->dimension;
+  allocate_swap(maxswap);
 }
 
 /* ---------------------------------------------------------------------- */