diff --git a/Pmodules/libpbuild.bash b/Pmodules/libpbuild.bash
index 1a4893b..4d766ca 100644
--- a/Pmodules/libpbuild.bash
+++ b/Pmodules/libpbuild.bash
@@ -156,6 +156,7 @@ pbuild::add_to_group() {
 }
 readonly -f pbuild::add_to_group
 
+declare -gx GROUP=''
 pbuild.add_to_group(){
 	GROUP="$1"
 }
@@ -302,6 +303,7 @@ pbuild::supported_compilers() {
 }
 readonly -f pbuild::supported_compilers
 
+declare SUPPORTED_COMPILERS=()
 pbuild.supported_compilers(){
 	SUPPORTED_COMPILERS+=( "$@" )
 }
@@ -324,6 +326,7 @@ pbuild::supported_systems() {
 }
 readonly -f pbuild::supported_systems
 
+declare SUPPORTED_SYSTEMS=()
 pbuild.supported_systems() {
 	SUPPORTED_SYSTEMS+=( "$@" )
 }
@@ -1057,7 +1060,6 @@ _build_module() {
 		P="${module_name}"
 		V="${module_version}"
 		parse_version "${module_version}"
-		declare -gx GROUP=''
 		declare -g  PREFIX=''
 		
 		SOURCE_URLS=()
@@ -1065,8 +1067,6 @@ _build_module() {
 		SOURCE_NAMES=()
 		declare -Ag SOURCE_UNPACK_DIRS=()
 		CONFIGURE_ARGS=()
-		SUPPORTED_SYSTEMS=()
-		SUPPORTED_COMPILERS=()
 		PATCH_FILES=()
 		PATCH_STRIPS=()
 		PATCH_STRIP_DEFAULT='1'
diff --git a/Pmodules/modbuild.in b/Pmodules/modbuild.in
index 48c1954..e7303ee 100755
--- a/Pmodules/modbuild.in
+++ b/Pmodules/modbuild.in
@@ -634,7 +634,7 @@ build_modules_yaml(){
 			pbuild.supported_compilers "${compilers[@]}"
 			if (( ${#deps[@]} > 0 )); then
 				while read -a with_modules; do
-					pbuild.build_module \
+					pbuild.build_module_yaml \
 					     "${name}" "${v##*/}" \
 					     "${relstage}" "${with_modules[@]}"
 				done < <(bash_expand "" ${deps[@]}|${awk} "${pattern}")