diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3b601e0..136b5d1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Changelog of Pmodules
 
+## Version 2.1.0
+### modulecmd
+* Bugfix: Under some conditions it could happen, that the variable
+  GroupDepths($group) was undefined in the function get\_load\_hints().
+  (#1368)
+
+## Version 2.0.5
+### modulecmd
+
 ## Version 2.0.4
 
 ### modulecmd
diff --git a/Pmodules/modulecmd.bash.in b/Pmodules/modulecmd.bash.in
index 871f4aa..72f14df 100644
--- a/Pmodules/modulecmd.bash.in
+++ b/Pmodules/modulecmd.bash.in
@@ -809,6 +809,8 @@ subcommand_load() {
 			fi
 			local -- group=${line[2]}
 			[[ "${group}" != 'none' ]] || continue
+			[[ -v GroupDepths[${group}] ]] || \
+                                scan_groups "${UsedOverlays[@]}"
 			if [[ ! ":${UsedGroups}:" == *:${group}:* ]] && \
 				   (( ${GroupDepths[${group}]} == 0 )); then
 				output+="module use ${group}; "