diff --git a/Pmodules/modulecmd.bash.in b/Pmodules/modulecmd.bash.in
index f3e8d88..5d98ad6 100644
--- a/Pmodules/modulecmd.bash.in
+++ b/Pmodules/modulecmd.bash.in
@@ -1353,7 +1353,7 @@ subcommand_use() {
 
 	use () {
                 use_overlay() {
-			if [[ -n "${_LMFILES_}" ]] && [[ ${LOADEDMODULES} != Pmodules/* ]]; then
+			if [[  $LOADEDMODULES == *:*  ]] || [[ $LOADEDMODULES != Pmodules/* ]]; then
 				std::die 3 "%s %s: %s -- %s" \
 					 "${CMD}" "${subcommand}" \
 					 "overlays can be added as long as no modules are loaded!" \
@@ -1558,7 +1558,7 @@ subcommand_unuse() {
 	unset IFS
         unuse() {
                 unuse_overlay() {
-			if [[ -n "${_LMFILES_}" ]] && [[ ${LOADEDMODULES} != Pmodules/* ]]; then
+			if [[  $LOADEDMODULES == *:*  ]] || [[ $LOADEDMODULES != Pmodules/* ]]; then
 				std::die 3 "%s %s: %s -- %s" \
 					 "${CMD}" "${subcommand}" \
 					 "overlays can NOT be removed as long as modules are loaded!" \