diff --git a/src/engine_redistribute.c b/src/engine_redistribute.c
index dbd2125b97dbd2bb06b5a355ede7b6196a7dc36f..a7ff8ff063d0c845cc37c183824849d1fc7c94fb 100644
--- a/src/engine_redistribute.c
+++ b/src/engine_redistribute.c
@@ -273,6 +273,7 @@ struct redist_mapper_data {
           parts[k].x[j] += s->dim[j];                                      \
         else if (parts[k].x[j] >= s->dim[j])                               \
           parts[k].x[j] -= s->dim[j];                                      \
+        if (parts[k].x[j] == s->dim[j]) parts[k].x[j] = 0.0;               \
       }                                                                    \
       const int cid = cell_getid(s->cdim, parts[k].x[0] * s->iwidth[0],    \
                                  parts[k].x[1] * s->iwidth[1],             \