diff --git a/install b/install
index 16bc51fe026c8290f88cb929491e4b2429482e15..b2045ef717add5eb225f982cbc4a8415c35155e7 100755
--- a/install
+++ b/install
@@ -161,7 +161,7 @@ else
 
         ## if MPI or METIS installation required install it
         if [ $conf_err -eq 200  ]; then
-            echo "MPI not found try to install"
+            echo "MPI not found try to install, $MPI_installed"
             if [ $MPI_installed -eq 1 ]; then
                 echo "Error the installation of MPI failed"
                 exit 1
@@ -169,7 +169,7 @@ else
             ./script/install_MPI.sh $i_dir $compiler_opt
             MPI_installed=1
             export PATH="$PATH:$i_dir/MPI/bin"
-
+            configure_options="$configure_options CXX=mpic++ "
         elif [ $conf_err -eq 201  ]; then
             echo "Metis not found try to install"
             if [ $METIS_installed -eq 1  ]; then
diff --git a/src/Grid/grid_dist_id_unit_test.hpp b/src/Grid/grid_dist_id_unit_test.hpp
index a24d3a0827e1e0bc950892ccc24bc6c289de0c52..fc4cbf3de715f3284167427e6ca2abe493a823ba 100644
--- a/src/Grid/grid_dist_id_unit_test.hpp
+++ b/src/Grid/grid_dist_id_unit_test.hpp
@@ -585,24 +585,24 @@ void Test3D_complex(const Box<3,float> & domain, long int k)
 			// In this case the boundary condition are non periodic
 			if (g_dist.isInside(key_g))
 			{
-				match &= (g_dist.template get<p::x>(key),1 + k)?true:false;
-				match &= (g_dist.template get<p::y>(key),567 + k)?true:false;
-				match &= (g_dist.template get<p::z>(key), 341 + k)?true:false;
-				match &= (g_dist.template get<p::s>(key), 5670 + k)?true:false;
-
-				match &= (g_dist.template get<p::v>(key)[0], 921 + k)?true:false;
-				match &= (g_dist.template get<p::v>(key)[1], 5675 + k)?true:false;
-				match &= (g_dist.template get<p::v>(key)[2], 117 + k)?true:false;
-
-				match &= (g_dist.template get<p::t>(key)[0][0], 1921 + k)?true:false;
-				match &= (g_dist.template get<p::t>(key)[0][1], 25675 + k)?true:false;
-				match &= (g_dist.template get<p::t>(key)[0][2], 3117 + k)?true:false;
-				match &= (g_dist.template get<p::t>(key)[1][0], 4921 + k)?true:false;
-				match &= (g_dist.template get<p::t>(key)[1][1], 55675 + k)?true:false;
-				match &= (g_dist.template get<p::t>(key)[1][2], 6117 + k)?true:false;
-				match &= (g_dist.template get<p::t>(key)[2][0], 7921 + k)?true:false;
-				match &= (g_dist.template get<p::t>(key)[2][1], 85675 + k)?true:false;
-				match &= (g_dist.template get<p::t>(key)[2][2], 9117 + k)?true:false;
+				match &= (g_dist.template get<p::x>(key) == 1 + k)?true:false;
+				match &= (g_dist.template get<p::y>(key) == 567 + k)?true:false;
+				match &= (g_dist.template get<p::z>(key) == 341 + k)?true:false;
+				match &= (g_dist.template get<p::s>(key) == 5670 + k)?true:false;
+
+				match &= (g_dist.template get<p::v>(key)[0] == 921 + k)?true:false;
+				match &= (g_dist.template get<p::v>(key)[1] == 5675 + k)?true:false;
+				match &= (g_dist.template get<p::v>(key)[2] == 117 + k)?true:false;
+
+				match &= (g_dist.template get<p::t>(key)[0][0] == 1921 + k)?true:false;
+				match &= (g_dist.template get<p::t>(key)[0][1] == 25675 + k)?true:false;
+				match &= (g_dist.template get<p::t>(key)[0][2] == 3117 + k)?true:false;
+				match &= (g_dist.template get<p::t>(key)[1][0] == 4921 + k)?true:false;
+				match &= (g_dist.template get<p::t>(key)[1][1] == 55675 + k)?true:false;
+				match &= (g_dist.template get<p::t>(key)[1][2] == 6117 + k)?true:false;
+				match &= (g_dist.template get<p::t>(key)[2][0] == 7921 + k)?true:false;
+				match &= (g_dist.template get<p::t>(key)[2][1] == 85675 + k)?true:false;
+				match &= (g_dist.template get<p::t>(key)[2][2] == 9117 + k)?true:false;
 			}
 
 			++domg;