diff --git a/src/gpu/GridGenerator/grid/GridBuilder/GridBuilder.h b/src/gpu/GridGenerator/grid/GridBuilder/GridBuilder.h
index 9548cdac7d2be9f0c2317b6b46c7f02764ff5350..52918af73cfcd6ba9674cb8788e95cb9fa3d2dd4 100644
--- a/src/gpu/GridGenerator/grid/GridBuilder/GridBuilder.h
+++ b/src/gpu/GridGenerator/grid/GridBuilder/GridBuilder.h
@@ -86,10 +86,12 @@ public:
     virtual uint getNumberOfReceiveIndices( int direction, uint level ) = 0;
     virtual void getSendIndices( int* sendIndices, int direction, int level ) = 0;
     virtual void getReceiveIndices( int* sendIndices, int direction, int level ) = 0;
-    virtual void reorderSendRecvIndexForCommAfterFtoC(int *sendIndices, int *recvIndices,
-                                                      int &numberOfSendNeighborsAfterFtoC,
-                                                      int &numberOfRecvNeighborsAfterFtoC, uint *iCellFCCBorder,
-                                                      uint sizeOfICellFCCBorder, int direction, int level) = 0;
+    virtual void reorderSendIndexForCommAfterFtoC(int *sendIndices, int &numberOfSendNeighborsAfterFtoC,
+                                                  uint *iCellFCCBorder, uint sizeOfICellFCCBorder, int direction,
+                                                  int level) = 0;
+    virtual void reorderRecvIndexForCommAfterFtoC(int *recvIndices, int &numberOfRecvNeighborsAfterFtoC,
+                                                  uint *iCellFCCBorder, uint sizeOfICellFCCBorder, int direction,
+                                                  int level) = 0;
 
     virtual uint getNumberOfFluidNodes(unsigned int level) const = 0;
     virtual void getFluidNodeIndices(uint *fluidNodeIndices, const int level) const = 0;
diff --git a/src/gpu/GridGenerator/grid/GridBuilder/LevelGridBuilder.cpp b/src/gpu/GridGenerator/grid/GridBuilder/LevelGridBuilder.cpp
index d9182fc54064ea37c82537ab0470da27211530d0..f84b7bc674135eb1d8f98cb33c38dcf2e270a56e 100644
--- a/src/gpu/GridGenerator/grid/GridBuilder/LevelGridBuilder.cpp
+++ b/src/gpu/GridGenerator/grid/GridBuilder/LevelGridBuilder.cpp
@@ -266,20 +266,15 @@ GRIDGENERATOR_EXPORT void LevelGridBuilder::getReceiveIndices(int * receiveIndic
     }
 }
 
-GRIDGENERATOR_EXPORT void LevelGridBuilder::reorderSendRecvIndexForCommAfterFtoC(int *sendIndices, int *recvIndices,
-                                                                                 int &numberOfSendNeighborsAfterFtoC,
-                                                                                 int &numberOfRecvNeighborsAfterFtoC,
-                                                                                 uint* iCellFCCBorder, 
-                                                                                 uint sizeOfICellFCCBorder,
-                                                                                 int direction, int level)
+GRIDGENERATOR_EXPORT void LevelGridBuilder::reorderSendIndexForCommAfterFtoC(int *sendIndices, int &numberOfSendNeighborsAfterFtoC,
+                                                                             uint* iCellFCCBorder,  uint sizeOfICellFCCBorder,
+                                                                             int direction, int level)
 {
     uint numberOfIndices = getNumberOfSendIndices(direction, level);
     int sparseIndexSend;
     bool isInICellFCCBorder;
     std::vector<int> sendIndicesAfterFtoC;
     std::vector<int> sendIndicesOther;
-    std::vector<int> recvIndicesAfterFtoC;
-    std::vector<int> recvIndicesOther;
 
     for (uint i = 0; i < numberOfIndices; i++) {
         sparseIndexSend = sendIndices[i];
@@ -294,29 +289,60 @@ GRIDGENERATOR_EXPORT void LevelGridBuilder::reorderSendRecvIndexForCommAfterFtoC
         }
 
         // add index to corresponding vector
-        if (isInICellFCCBorder) {
+        if (isInICellFCCBorder)
             sendIndicesAfterFtoC.push_back(sparseIndexSend);
-            recvIndicesAfterFtoC.push_back(sparseIndexSend);
-        } else {
-            sendIndicesOther.push_back(recvIndices[i]);
-            recvIndicesOther.push_back(recvIndices[i]);
-        }
+        else
+            sendIndicesOther.push_back(sparseIndexSend);
     }
 
     numberOfSendNeighborsAfterFtoC = sendIndicesAfterFtoC.size();
-    numberOfRecvNeighborsAfterFtoC = recvIndicesAfterFtoC.size();
 
-    // copy new vectors back to sendIndices and receive indices arrays
-    for (uint i = 0; i < numberOfSendNeighborsAfterFtoC; i++) {
+    // copy new vectors back to sendIndices array
+    for (uint i = 0; i < numberOfSendNeighborsAfterFtoC; i++)
         sendIndices[i] = sendIndicesAfterFtoC[i];
-        recvIndices[i] = recvIndicesAfterFtoC[i];
-    }
     for (uint i = 0; i < sendIndicesOther.size(); i++) {
         sendIndices[i + numberOfSendNeighborsAfterFtoC] = sendIndicesOther[i];
-        recvIndices[i + numberOfRecvNeighborsAfterFtoC] = recvIndicesOther[i];
     }
 }
 
+GRIDGENERATOR_EXPORT void LevelGridBuilder::reorderRecvIndexForCommAfterFtoC(int *recvIndices, int &numberOfRecvNeighborsAfterFtoC,
+                                                                             uint *iCellFCCBorder, uint sizeOfICellFCCBorder, 
+                                                                             int direction, int level)
+{
+    uint numberOfIndices = getNumberOfReceiveIndices(direction, level);
+    int sparseIndexRecv;
+    bool isInICellFCCBorder;
+    std::vector<int> recvIndicesAfterFtoC;
+    std::vector<int> recvIndicesOther;
+
+    for (uint i = 0; i < numberOfIndices; i++) {
+        sparseIndexRecv = recvIndices[i];
+
+        // check if sparse index is in ICellFCC border
+        isInICellFCCBorder = false;
+        for (uint j = 0; j < sizeOfICellFCCBorder; j++) {
+            if (iCellFCCBorder[j] == sparseIndexRecv) {
+                isInICellFCCBorder = true;
+                break;
+            }
+        }
+
+        // add index to corresponding vector
+        if (isInICellFCCBorder)
+            recvIndicesAfterFtoC.push_back(sparseIndexRecv);
+        else
+            recvIndicesOther.push_back(sparseIndexRecv);
+    }
+
+    numberOfRecvNeighborsAfterFtoC = recvIndicesAfterFtoC.size();
+
+    // copy new vectors back to receiveIndices array
+    for (uint i = 0; i < numberOfRecvNeighborsAfterFtoC; i++)
+        recvIndices[i] = recvIndicesAfterFtoC[i];
+    for (uint i = 0; i < recvIndicesOther.size(); i++)
+        recvIndices[i + numberOfRecvNeighborsAfterFtoC] = recvIndicesOther[i];
+}
+
 uint LevelGridBuilder::getNumberOfNodes(unsigned int level) const
 {
     return grids[level]->getSparseSize();
diff --git a/src/gpu/GridGenerator/grid/GridBuilder/LevelGridBuilder.h b/src/gpu/GridGenerator/grid/GridBuilder/LevelGridBuilder.h
index fdaa6e25d2fa97c737581b66b84750ed042e64eb..704067e2f685050215d65d800fb47308db9e7c4f 100644
--- a/src/gpu/GridGenerator/grid/GridBuilder/LevelGridBuilder.h
+++ b/src/gpu/GridGenerator/grid/GridBuilder/LevelGridBuilder.h
@@ -149,11 +149,12 @@ public:
     GRIDGENERATOR_EXPORT uint getNumberOfReceiveIndices( int direction, uint level ) override;
     GRIDGENERATOR_EXPORT void getSendIndices( int* sendIndices, int direction, int level ) override;
     GRIDGENERATOR_EXPORT void getReceiveIndices( int* sendIndices, int direction, int level ) override;
-    GRIDGENERATOR_EXPORT void reorderSendRecvIndexForCommAfterFtoC(int *sendIndices, int *recvIndices,
-                                                                   int &numberOfSendNeighborsAfterFtoC,
-                                                                   int &numberOfRecvNeighborsAfterFtoC,
-                                                                   uint *iCellFCCBorder, uint sizeOfICellFCCBorder,
-                                                                   int direction, int level) override;
+    GRIDGENERATOR_EXPORT void reorderSendIndexForCommAfterFtoC(int *sendIndices, int &numberOfSendNeighborsAfterFtoC,
+                                                               uint *iCellFCCBorder, uint sizeOfICellFCCBorder,
+                                                               int direction, int level) override;
+    GRIDGENERATOR_EXPORT void reorderRecvIndexForCommAfterFtoC(int *recvIndices, int &numberOfRecvNeighborsAfterFtoC,
+                                                               uint *iCellFCCBorder, uint sizeOfICellFCCBorder,
+                                                               int direction, int level) override;
 
 };