diff --git a/cmd/root.go b/cmd/root.go
index 775c4795c06c0a7897f74586e432c9f01f00d4c3..6c6f167ded7da9021cf815a4fe400bcc9b7ebf4d 100644
--- a/cmd/root.go
+++ b/cmd/root.go
@@ -357,7 +357,7 @@ func expandEnvCmdObjs(cmd *cobra.Command, envSpec *envSpec, cwd metadata.AbsPath
 	}
 
 	fileNames := envSpec.files
-	if envPresent && !filesPresent {
+	if envPresent {
 		manager, err := metadata.Find(cwd)
 		if err != nil {
 			return nil, err
@@ -366,10 +366,13 @@ func expandEnvCmdObjs(cmd *cobra.Command, envSpec *envSpec, cwd metadata.AbsPath
 		libPath, envLibPath := manager.LibPaths(*envSpec.env)
 		expander.FlagJpath = append([]string{string(libPath), string(envLibPath)}, expander.FlagJpath...)
 
-		fileNames, err = manager.ComponentPaths()
-		if err != nil {
-			return nil, err
+		if !filesPresent {
+			fileNames, err = manager.ComponentPaths()
+			if err != nil {
+				return nil, err
+			}
 		}
+
 	}
 
 	//