2 files changed, 5 insertions, 1 deletions
diff --git a/Completion/Core/_files b/Completion/Core/_files
index 96bdbe0e7..8d2b245d0 100644
--- a/Completion/Core/_files
+++ b/Completion/Core/_files
@@ -55,7 +55,7 @@ for def in "$pats[@]"; do
   for sdef in "$def[@]"; do
 
     tag="${${sdef#*[^\\]:}%%:*}"
-    pat="${${${sdef%%:${tag}*}//\\:/:}//,/ }"
+    pat="${${sdef%%:${tag}*}//\\:/:}"
 
     (( $tried[(I)${(q)pat}] )) && continue
 
diff --git a/Completion/Core/_path_files b/Completion/Core/_path_files
index 23d32cc0f..b9f578860 100644
--- a/Completion/Core/_path_files
+++ b/Completion/Core/_path_files
@@ -315,6 +315,10 @@ for prepath in "$prepaths[@]"; do
       SUFFIX="${tsuf%%/*}"
     fi
 
+    # Force auto-mounting. There might be a better way...
+
+    : ${^tmp1}/${PREFIX}${SUFFIX}/.(N/)
+
     # Get the matching files by globbing.
 
     if [[ "$tpre$tsuf" = */* ]]; then