diff --git a/mpi.prov b/mpi.prov
index e6aeb54..a37dbce 100755
--- a/mpi.prov
+++ b/mpi.prov
@@ -45,7 +45,7 @@ if [ -e /etc/profile.d/modules.sh ]; then
   done
   export MODULEPATH="$MODULEPATH:$(IFS=:; echo "${_MODULEPATH[*]}")"
 
-  for module in $(module -t avail 2>&1 | grep "^mpi/."); do
+  for module in $(module -t avail 2>&1 | grep "^mpi/." | sed "s/(default)$//"); do
     module load $module
     mpi_compiler_for_dir[${MPI_HOME}]=${MPI_COMPILER}
     mpi_compiler_for_dir[${MPI_FORTRAN_MOD_DIR}]=${MPI_COMPILER}
diff --git a/mpi.req b/mpi.req
index 423ea99..6055aa5 100755
--- a/mpi.req
+++ b/mpi.req
@@ -47,7 +47,7 @@ if [ -e /etc/profile.d/modules.sh ]; then
   done
   export MODULEPATH="$MODULEPATH:$(IFS=:; echo "${_MODULEPATH[*]}")"
 
-  for module in $(module -t avail 2>&1 | grep "^mpi/."); do
+  for module in $(module -t avail 2>&1 | grep "^mpi/." | sed "s/(default)$//"); do
     module load $module
     mpi_compiler_for_dir[${MPI_HOME}]=${MPI_COMPILER}
     mpi_compiler_for_dir[${MPI_FORTRAN_MOD_DIR}]=${MPI_COMPILER}
diff --git a/rpm-mpi-hooks.spec b/rpm-mpi-hooks.spec
index c6d2604..e0a03df 100644
--- a/rpm-mpi-hooks.spec
+++ b/rpm-mpi-hooks.spec
@@ -1,5 +1,5 @@
 Name:           rpm-mpi-hooks
-Version:        7
+Version:        8
 Release:        2%{?dist}
 Summary:        RPM dependency generator hooks for MPI packages
 
@@ -46,6 +46,10 @@ install -Dpm 0755 %{SOURCE3} %{buildroot}%{_rpmconfigdir}/mpi.req
 
 
 %changelog
+* Fri Jul 02 2021 Honggang Li <honli@redhat.com> - 8-2
+- Sync with latest Fedora repo
+- Resolves: rhbz#1972736
+
 * Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 7-2
 - Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937