diff --git a/cli/htmgo/tasks/downloadtemplate/main.go b/cli/htmgo/tasks/downloadtemplate/main.go
index b0fecec..c39b0c1 100644
--- a/cli/htmgo/tasks/downloadtemplate/main.go
+++ b/cli/htmgo/tasks/downloadtemplate/main.go
@@ -60,8 +60,8 @@ func DownloadTemplate(outPath string) {
 	process.SetWorkingDir(newDir)
 
 	commands := [][]string{
-		{"go", "get", "github.com/maddalax/htmgo/framework"},
-		{"go", "get", "github.com/maddalax/htmgo/framework-ui"},
+		{"go", "get", "github.com/maddalax/htmgo/framework@latest"},
+		{"go", "get", "github.com/maddalax/htmgo/framework-ui@latest"},
 		{"git", "init"},
 	}
 
diff --git a/cli/htmgo/tasks/module/module.go b/cli/htmgo/tasks/module/module.go
index 5476cf5..2d1952f 100644
--- a/cli/htmgo/tasks/module/module.go
+++ b/cli/htmgo/tasks/module/module.go
@@ -2,12 +2,14 @@ package module
 
 import (
 	"fmt"
+	"github.com/maddalax/htmgo/cli/htmgo/tasks/process"
 	"os/exec"
 	"strings"
 )
 
 func GetDependencyPath(dep string) string {
 	cmd := exec.Command("go", "list", "-m", "-f", "{{.Dir}}", dep)
+	cmd.Dir = process.GetWorkingDir()
 	// Run the command and capture the output
 	output, err := cmd.CombinedOutput() // Use CombinedOutput to capture both stdout and stderr
 	if err != nil {