diff --git a/mpcdf_common.py b/mpcdf_common.py
index 5147d90ae721a3a2f02360944489c07c02fdb92a..31a4eca1ecb89bc28293e263ae75797c86c66eb9 100644
--- a/mpcdf_common.py
+++ b/mpcdf_common.py
@@ -204,7 +204,7 @@ def valid_mpi(compiler, mpi):
     the package software:dist / mpcdf_cluster_macros
     """
     if compiler.startswith("intel") and mpi.startswith("impi"):
-        if compiler.endswith("_x"):
+        if compiler in compiler_x_parallel_studio:
             return mpi == compiler_x_parallel_studio[compiler]["impi"]
         return mpi == compiler_parallel_studio[compiler]["impi"]
     if compiler.startswith("pgi"):