diff --git a/analysis/runAnalysis.cpp b/analysis/runAnalysis.cpp
index a96b8390..46ed8772 100644
--- a/analysis/runAnalysis.cpp
+++ b/analysis/runAnalysis.cpp
@@ -437,7 +437,7 @@ AnalysisType runAnalysis::computeAnalysisType( int timestep )
             type |= AnalysisType::IdentifyBlobs;
         }
     #endif */
-    if ( timestep%d_analysis_interval + 4 == 0 ) {
+    if ( timestep%d_analysis_interval + 4 == d_analysis_interval ) {
         // Copy the averages to the CPU (and identify blobs)
         type |= AnalysisType::CopySimState;
         type |= AnalysisType::IdentifyBlobs;
@@ -487,39 +487,38 @@ void runAnalysis::run( int timestep, TwoPhase& Averages, const double *Phi,
     PROFILE_START("Copy data to host",1);
     std::shared_ptr<DoubleArray> phase;
     if ( matches(type,AnalysisType::CopyPhaseIndicator) ||
-         matches(type,AnalysisType::ComputeAverages) ||
-         matches(type,AnalysisType::CopySimState) || 
-         matches(type,AnalysisType::IdentifyBlobs) )
+    		matches(type,AnalysisType::ComputeAverages) ||
+    		matches(type,AnalysisType::CopySimState) || 
+    		matches(type,AnalysisType::IdentifyBlobs) )
     {
-        phase = std::shared_ptr<DoubleArray>(new DoubleArray(d_N[0],d_N[1],d_N[2]));
-        //ScaLBL_CopyToHost(phase->data(),Phi,N*sizeof(double));
-        //   try 2 d_ScaLBL_Comm.RegularLayout(d_Map,Phi,Averages.Phase);
-        //   memcpy(Averages.Phase.data(),phase->data(),N*sizeof(double));
-        int Nx = d_N[0];
-        int Ny = d_N[1];
-        int Nz = d_N[2];
-        double *TmpDat;
-        double value;
-        TmpDat = new double [d_Np];
-        ScaLBL_CopyToHost(&TmpDat[0],&Phi[0], d_Np*sizeof(double));
-        for (int k=0; k<Nz; k++){
-	  for (int j=0; j<Ny; j++){
-	    for (int i=0; i<Nx; i++){
-	      int n=k*Nx*Ny+j*Nx+i;
-	      int idx=d_Map(i,j,k);
-	      if (!(idx<0)){
-		double value=TmpDat[idx];
-		//regdata(i,j,k)=value;
-		phase->data()[n]=value;
-	      }
-	    }
-	  }
-        }
-        delete [] TmpDat;
+    	phase = std::shared_ptr<DoubleArray>(new DoubleArray(d_N[0],d_N[1],d_N[2]));
+    	//ScaLBL_CopyToHost(phase->data(),Phi,N*sizeof(double));
+    	//   try 2 d_ScaLBL_Comm.RegularLayout(d_Map,Phi,Averages.Phase);
+    	//   memcpy(Averages.Phase.data(),phase->data(),N*sizeof(double));
+    	int Nx = d_N[0];
+    	int Ny = d_N[1];
+    	int Nz = d_N[2];
+    	double *TmpDat;
+    	double value;
+    	TmpDat = new double [d_Np];
+    	ScaLBL_CopyToHost(&TmpDat[0],&Phi[0], d_Np*sizeof(double));
+    	for (int k=0; k<Nz; k++){
+    		for (int j=0; j<Ny; j++){
+    			for (int i=0; i<Nx; i++){
+    				int n=k*Nx*Ny+j*Nx+i;
+    				int idx=d_Map(i,j,k);
+    				if (!(idx<0)){
+    					double value=TmpDat[idx];
+    					//regdata(i,j,k)=value;
+    					phase->data()[n]=value;
+    				}
+    			}
+    		}
+    	}
+    	delete [] TmpDat;
     }
     if ( matches(type,AnalysisType::CopyPhaseIndicator) ) {
         memcpy(Averages.Phase_tplus.data(),phase->data(),N*sizeof(double));
-
         //Averages.ColorToSignedDistance(d_beta,Averages.Phase,Averages.Phase_tplus);
     }
     if ( matches(type,AnalysisType::ComputeAverages) ) {