diff --git a/cmake/machines/CLAIX.sh b/cmake/machines/CLAIX.sh
index 58d2802124615c1281fbdaac2fca40cdfe255c78..9c5cf9e334d8fd359605f172fd07ad730c5a2e93 100644
--- a/cmake/machines/CLAIX.sh
+++ b/cmake/machines/CLAIX.sh
@@ -12,14 +12,17 @@
        export FC=$MPIFC
        export CC=$MPICC
     fi
-    #ELPA
-    if [ $ELPA_MODULES ]
-    then
-      CLI_ELPA_OPENMP=1
-      FLEUR_LIBDIR="$FLEUR_LIBDIR $ELPA_LIB"
-      FLEUR_INCLUDEDIR="$FLEUR_INCLUDEDIR $ELPA_MODULES"
-    fi
   elif  module list 2>&1 | grep -q pgi
   then
     echo "found PGI compiler"
-  fi 
+  fi
+
+  #ELPA
+  if [ $ELPA_MODULES ]
+  then
+    CLI_ELPA_OPENMP=1
+    FLEUR_LIBDIR="$FLEUR_LIBDIR $ELPA_LIB"
+    FLEUR_INCLUDEDIR="$FLEUR_INCLUDEDIR $ELPA_MODULES"
+  fi
+
+