diff --git a/common/ScaLBL.cpp b/common/ScaLBL.cpp
index 1bc32c5f..0c4caa81 100644
--- a/common/ScaLBL.cpp
+++ b/common/ScaLBL.cpp
@@ -413,12 +413,12 @@ int ScaLBL_Communicator::MemoryOptimizedLayoutAA(IntArray &Map, int *neighborLis
 	for (k=2; k<Nz-2; k++){
 		for (j=2; j<Ny-2; j++){
 			for (i=2; i<Nx-2; i++){
-			  // Local index (regular layout)
-			  n = k*Nx*Ny + j*Nx + i;
-			  if (id[n] > 0 ){
-				Map(n) = idx++;
-				//neighborList[idx++] = n; // index of self in regular layout
-			  }
+				// Local index (regular layout)
+				n = k*Nx*Ny + j*Nx + i;
+				if (id[n] > 0 ){
+					Map(n) = idx++;
+					//neighborList[idx++] = n; // index of self in regular layout
+				}
 			}
 		}
 	}
@@ -543,14 +543,6 @@ int ScaLBL_Communicator::MemoryOptimizedLayoutAA(IntArray &Map, int *neighborLis
 	}
 	ScaLBL_CopyToDevice(dvcSendList_x,TempBuffer,sendCount_x*sizeof(int));
 
-
-
-
-
-
-
-
-
 	ScaLBL_CopyToHost(TempBuffer,dvcSendList_y,sendCount_y*sizeof(int));
 	for (i=0; i<sendCount_y; i++){
 		n = TempBuffer[i];
@@ -568,12 +560,6 @@ int ScaLBL_Communicator::MemoryOptimizedLayoutAA(IntArray &Map, int *neighborLis
 	ScaLBL_CopyToDevice(dvcSendList_z,TempBuffer,sendCount_z*sizeof(int));
 
 
-
-
-
-
-
-
 	ScaLBL_CopyToHost(TempBuffer,dvcSendList_X,sendCount_X*sizeof(int));
 	for (i=0; i<sendCount_X; i++){
 		n = TempBuffer[i];
@@ -585,11 +571,6 @@ int ScaLBL_Communicator::MemoryOptimizedLayoutAA(IntArray &Map, int *neighborLis
 	ScaLBL_CopyToDevice(dvcSendList_X,TempBuffer,sendCount_X*sizeof(int));
 
 
-
-
-
-
-
 	ScaLBL_CopyToHost(TempBuffer,dvcSendList_Y,sendCount_Y*sizeof(int));
 	for (i=0; i<sendCount_Y; i++){
 		n = TempBuffer[i];
@@ -716,19 +697,6 @@ int ScaLBL_Communicator::MemoryOptimizedLayoutAA(IntArray &Map, int *neighborLis
 	ScaLBL_CopyToDevice(dvcRecvDist_x,TempBuffer,5*recvCount_x*sizeof(int));
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
 	ScaLBL_CopyToHost(TempBuffer,dvcRecvDist_y,5*recvCount_y*sizeof(int));
 	for (i=0; i<5*recvCount_y; i++){
 		n = TempBuffer[i];
@@ -748,15 +716,6 @@ int ScaLBL_Communicator::MemoryOptimizedLayoutAA(IntArray &Map, int *neighborLis
 	ScaLBL_CopyToDevice(dvcRecvDist_z,TempBuffer,5*recvCount_z*sizeof(int));
 
 
-
-
-
-
-
-
-
-
-
 	ScaLBL_CopyToHost(TempBuffer,dvcRecvDist_X,5*recvCount_X*sizeof(int));
 	for (i=0; i<5*recvCount_X; i++){
 		n = TempBuffer[i];
@@ -768,22 +727,6 @@ int ScaLBL_Communicator::MemoryOptimizedLayoutAA(IntArray &Map, int *neighborLis
 	ScaLBL_CopyToDevice(dvcRecvDist_X,TempBuffer,5*recvCount_X*sizeof(int));
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 	ScaLBL_CopyToHost(TempBuffer,dvcRecvDist_Y,5*recvCount_Y*sizeof(int));
 	for (i=0; i<5*recvCount_Y; i++){
 		n = TempBuffer[i];
diff --git a/models/ColorModel.cpp b/models/ColorModel.cpp
index 593244e6..78c2c34e 100644
--- a/models/ColorModel.cpp
+++ b/models/ColorModel.cpp
@@ -265,8 +265,14 @@ void ScaLBL_ColorModel::Create(){
 		}
 	}
 	// check that TmpMap is valid
-	for (int idx=0; idx<ScaLBL_Comm->LastInterior(); idx++){
-		if (idx == ScaLBL_Comm->LastExterior()) idx = ScaLBL_Comm->FirstInterior();
+	for (int idx=0; idx<ScaLBL_Comm->LastExterior(); idx++){
+		int n = TmpMap[idx];
+		if (n > Nx*Ny*Nz){
+			printf("Bad value! idx=%i \n");
+			TmpMap[idx] = Nx*Ny*Nz-1;
+		}
+	}
+	for (int idx=ScaLBL_Comm->FirstInterior(); idx<ScaLBL_Comm->LastInterior(); idx++){
 		int n = TmpMap[idx];
 		if (n > Nx*Ny*Nz){
 			printf("Bad value! idx=%i \n");