diff --git a/lib/functions/general/git.sh b/lib/functions/general/git.sh
index 4765f3a558..26259e5399 100644
--- a/lib/functions/general/git.sh
+++ b/lib/functions/general/git.sh
@@ -296,7 +296,12 @@ function fetch_from_repo() {
 
 					display_alert "Updating submodule" "${name} - ${surl} - ${sref}" "git"
 					git_ensure_safe_directory "$workdir/$path"
-					fetch_from_repo "$surl" "$workdir/$path" "$sref"
+
+					if [[ "${GIT_FIXED_WORKDIR}" != "" ]]; then
+						GIT_FIXED_WORKDIR="${GIT_FIXED_WORKDIR}/${path}" fetch_from_repo "$surl" "$workdir/$path" "$sref"
+					else
+						fetch_from_repo "$surl" "$workdir/$path" "$sref"
+					fi
 
 				done < <(git config -f .gitmodules --get-regexp 'submodule\..*\.path')
 			fi