diff --git a/analysis/runAnalysis.cpp b/analysis/runAnalysis.cpp
index 059ff612..d53dba1c 100644
--- a/analysis/runAnalysis.cpp
+++ b/analysis/runAnalysis.cpp
@@ -558,7 +558,7 @@ runAnalysis::runAnalysis(std::shared_ptr<Database> input_db, const RankInfoStruc
     IO::initialize("","silo","false");
     // Create the MeshDataStruct    
     d_meshData.resize(1);
-    
+
     d_meshData[0].meshName = "domain";
     d_meshData[0].mesh = std::make_shared<IO::DomainMesh>( Dm->rank_info,Dm->Nx-2,Dm->Ny-2,Dm->Nz-2,Dm->Lx,Dm->Ly,Dm->Lz );
     auto PhaseVar = std::make_shared<IO::Variable>();
diff --git a/common/Domain.cpp b/common/Domain.cpp
index 23e173e8..f94382d7 100644
--- a/common/Domain.cpp
+++ b/common/Domain.cpp
@@ -362,10 +362,10 @@ void Domain::Decomp(std::string Filename)
 		
 		// relabel the data
 		std::vector<long int> LabelCount(ReadValues.size(),0);
-		for (int k = 0; k<Nz; k++){
-			for (int j = 0; j<Ny; j++){
-				for (int i = 0; i<Nx; i++){
-					n = k*Nx*Ny+j*Nx+i;
+		for (int k = 0; k<global_Nz; k++){
+			for (int j = 0; j<global_Ny; j++){
+				for (int i = 0; i<global_Nx; i++){
+					n = k*global_Nx*global_Ny+j*global_Nx+i;
 					//char locval = loc_id[n];
 					char locval = SegData[n];
 					for (int idx=0; idx<ReadValues.size(); idx++){
diff --git a/tests/lbpm_morphdrain_pp.cpp b/tests/lbpm_morphdrain_pp.cpp
index 7381bfc5..4994e081 100644
--- a/tests/lbpm_morphdrain_pp.cpp
+++ b/tests/lbpm_morphdrain_pp.cpp
@@ -32,20 +32,13 @@ int main(int argc, char **argv)
 		//.......................................................................
 		// Reading the domain information file
 		//.......................................................................
-		int nprocx, nprocy, nprocz, nx, ny, nz, nspheres;
-		double Lx, Ly, Lz;
-		int i,j,k,n;
-		int BC=0;
-		//  char fluidValue,solidValue;
-		int MAXTIME=1000;
-		int READ_FROM_BLOCK=0;
-
+		int n, nprocx, nprocy, nprocz, nx, ny, nz;
 		char LocalRankString[8];
 		char LocalRankFilename[40];
-		char FILENAME[64];
+		char FILENAME[128];
 
 		string filename;
-		double Rcrit_new, SW;
+		double SW,Rcrit_new;
 		if (argc > 1){
 			filename=argv[1];
 			Rcrit_new=0.f; 
@@ -109,9 +102,13 @@ int main(int argc, char **argv)
 			for (int j=0;j<ny;j++){
 				for (int i=0;i<nx;i++){
 					int n = k*nx*ny+j*nx+i;
+					id[n] = Mask->id[n];
 					// Initialize the solid phase
-					if (Mask->id[n] > 0)	id_solid(i,j,k) = 1;
-					else	     			id_solid(i,j,k) = 0;
+					if (Mask->id[n] > 0){
+						id_solid(i,j,k) = 1;
+					}
+					else	    
+						id_solid(i,j,k) = 0;
 				}
 			}
 		}
@@ -205,9 +202,12 @@ int main(int argc, char **argv)
 				}
 			}
 		}
-		sprintf(FILENAME,READFILE.c_str(),"morphdrain.raw");
-		Mask->AggregateLabels(FILENAME);
+		MPI_Barrier(comm);
 
+		sprintf(FILENAME,READFILE.c_str());
+		sprintf(FILENAME+strlen(FILENAME),".morphdrain.raw");
+		if (rank==0) printf("Writing file to: %s \n", FILENAME);
+		Mask->AggregateLabels(FILENAME);
 	}
 
 	MPI_Barrier(comm);