diff --git a/lib/toolchain.py b/lib/toolchain.py
index ae0015b..8b60625 100644
--- a/lib/toolchain.py
+++ b/lib/toolchain.py
@@ -44,9 +44,9 @@ def set_toolchain(compiler, mpi):
             cxx = "mpicxx"
             fc = "mpif90"
         elif mpi == "necmpi":
-            cc = "mpicc -vh"
-            cxx = "mpic++ -vh"
-            fc = "mpinfort -vh"
+            cc = "\"mpincc -vh\""
+            cxx = "\"mpinc++ -vh\""
+            fc = "\"mpinfort -vh\""
             os.environ["NMPI_CC_H"] = "gcc"
             os.environ["NMPI_CXX_H"] = "g++"
             os.environ["NMPI_FC_H"] = "gfortran"
@@ -65,9 +65,9 @@ def set_toolchain(compiler, mpi):
             cxx = "\"mpicxx -cxx=clang++\""
             fc = "\"mpif90 -fc=flang\""
         elif mpi == "necmpi":
-            cc = "mpicc -vh"
+            cc = "\"mpincc -vh\""
             cxx = "mpic++ -vh"
-            fc = "mpinfort -vh"
+            fc = "\"mpinfort -vh\""
             os.environ["NMPI_CC_H"] = "clang"
             os.environ["NMPI_CXX_H"] = "clang++"
             os.environ["NMPI_FC_H"] = "flang"
@@ -86,9 +86,9 @@ def set_toolchain(compiler, mpi):
             cxx = "mpiicpc"
             fc = "mpiifort"
         elif mpi == "necmpi":
-            cc = "mpicc -vh"
+            cc = "\"mpincc -vh\""
             cxx = "mpic++ -vh"
-            fc = "mpinfort -vh"
+            fc = "\"mpinfort -vh\""
             os.environ["NMPI_CC_H"] = "icc"
             os.environ["NMPI_CXX_H"] = "icpc"
             os.environ["NMPI_FC_H"] = "ifort"