diff --git a/modules/intel.sh b/modules/intel.sh
index 450658e55b08bb2df7e916501376d137f7727035..f4043d1ab29589f691c682f1400722bc85bfb155 100644
--- a/modules/intel.sh
+++ b/modules/intel.sh
@@ -3,15 +3,10 @@
 . ~/modules/module-exists.sh
 
 module purge
-if module_exists intel/21.2.0; then
-	# Raven
-	module load intel/21.2.0
-	module load impi/2021.2
-else
-	# Freya, Cobra
-	module load intel/19.1.3
-	module load impi/2019.9
-fi
+
+module load intel/21.7.1
+module load impi/2021.7
+
 . ~/modules/common.sh
 
 # if running interactively: set MPI variables; else stop
diff --git a/modules/module-exists.sh b/modules/module-exists.sh
index 1d7534d2f8744c05c9da8f6d24d1b01721b6ce06..391d2ad6a12724ce44478dffe98a37adbf0f93ed 100644
--- a/modules/module-exists.sh
+++ b/modules/module-exists.sh
@@ -1,6 +1,5 @@
 #!/bin/sh
 
 module_exists() {
-    avail=$(module avail "$1" 2>&1)
-    [ -n "$avail" ]
+    module avail "$1" 2>&1 | grep -q "$1"
 }