diff --git a/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/registry/CommandResolverImpl.java b/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/registry/CommandResolverImpl.java
index 30f9956..d742a78 100644
--- a/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/registry/CommandResolverImpl.java
+++ b/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/registry/CommandResolverImpl.java
@@ -114,7 +114,7 @@
 
     private FileObject getAliasesRoot() throws FileSystemException {
         if (aliasesRoot == null) {
-            aliasesRoot = fileSystemAccess.createVirtualFileSystem(ALIASES_ROOT);
+            aliasesRoot = fileSystemAccess.resolveFile(null, ALIASES_ROOT);
         }
 
         return aliasesRoot;
@@ -147,7 +147,7 @@
 
     private FileObject getCommandsRoot() throws FileSystemException {
         if (commandsRoot == null) {
-            commandsRoot = fileSystemAccess.createVirtualFileSystem(COMMANDS_ROOT);
+            commandsRoot = fileSystemAccess.resolveFile(null, COMMANDS_ROOT);
         }
 
         return commandsRoot;
diff --git a/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/registry/GroupDirectoryResolver.java b/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/registry/GroupDirectoryResolver.java
index 9af4400..01ef29d 100644
--- a/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/registry/GroupDirectoryResolver.java
+++ b/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/registry/GroupDirectoryResolver.java
@@ -48,7 +48,7 @@
 
     private FileObject getCommandsRoot() throws FileSystemException {
         if (commandsRoot == null) {
-            commandsRoot = fileSystemAccess.createVirtualFileSystem(CommandResolver.COMMANDS_ROOT);
+            commandsRoot = fileSystemAccess.resolveFile(null, CommandResolver.COMMANDS_ROOT);
         }
 
         return commandsRoot;
