diff --git a/common/TwoPhase.cpp b/common/TwoPhase.cpp
index fa724820..720ec85e 100644
--- a/common/TwoPhase.cpp
+++ b/common/TwoPhase.cpp
@@ -191,9 +191,9 @@ void TwoPhase::ColorToSignedDistance(double Beta, DoubleArray &ColorData, Double
 				else			TempID[n] = 0;
 
 			 	temp = factor*log((1.0+value)/(1.0-value));
-				if (value > 0.8) DistData(i,j,k) = 2.94*factor;
-				else if (value < -0.8) DistData(i,j,k) = -2.94*factor;
-				else DistData(i,j,k) = temp;
+			 	if (value > 0.8) DistData(i,j,k) = 2.94*factor;
+			 	else if (value < -0.8) DistData(i,j,k) = -2.94*factor;
+			 	else DistData(i,j,k) = temp;
 
 				// Basic threshold
 				//if (value > 0) DistData(i,j,k) = 1.0;
@@ -205,7 +205,7 @@ void TwoPhase::ColorToSignedDistance(double Beta, DoubleArray &ColorData, Double
 
 	SSO(DistData,TempID,Dm,40);
 
-        for (int k=0; k<Nz; k++){
+    for (int k=0; k<Nz; k++){
 	  for (int j=0; j<Ny; j++){
 	    for (int i=0; i<Nx; i++){
 	      DistData(i,j,k) += 1.0;
diff --git a/tests/lbpm_color_simulator.h b/tests/lbpm_color_simulator.h
index 9a4b18f2..afed2d42 100644
--- a/tests/lbpm_color_simulator.h
+++ b/tests/lbpm_color_simulator.h
@@ -186,8 +186,6 @@ public:
         }
         if ( (type&CalcDist) != 0 ) {
             PROFILE_START("Compute dist",1);
-            Averages.ColorToSignedDistance(beta,Averages.Phase_tplus,Averages.Phase_tplus);
-            Averages.ColorToSignedDistance(beta,Averages.Phase_tminus,Averages.Phase_tminus);
             Averages.Initialize();
             Averages.ComputeDelPhi();
             Averages.ColorToSignedDistance(beta,Averages.Phase,Averages.SDn);
@@ -283,10 +281,12 @@ void run_analysis( int timestep, int restart_interval,
         CopyToHost(phase->get(),Phi,N*sizeof(double));
     }
     if ( (type&CopyPhaseIndicator)!=0 ) {
-        memcpy(Averages.Phase_tplus.get(),phase->get(),N*sizeof(double));
+        //memcpy(Averages.Phase_tplus.get(),phase->get(),N*sizeof(double));
+        Averages.ColorToSignedDistance(beta,phase,Averages.Phase_tplus);
     }
     if ( (type&CalcDist)!=0 ) {
-        memcpy(Averages.Phase_tminus.get(),phase->get(),N*sizeof(double));
+        //memcpy(Averages.Phase_tminus.get(),phase->get(),N*sizeof(double));
+        Averages.ColorToSignedDistance(beta,phase,Averages.Phase_tminus);
     }
     if ( (type&CopyAverages) != 0 ) {
         // Copy the members of Averages to the cpu (phase was copied above)