diff --git a/filemanager.go b/filemanager.go
index eb10695d..0ba46d6a 100644
--- a/filemanager.go
+++ b/filemanager.go
@@ -10,7 +10,6 @@ package filemanager
 import (
 	e "errors"
 	"net/http"
-	"net/url"
 	"strings"
 
 	"github.com/hacdias/caddy-filemanager/assets"
@@ -84,18 +83,7 @@ func (f FileManager) ServeHTTP(w http.ResponseWriter, r *http.Request) (int, err
 
 			// Preprocess the PUT request if it's the case
 			if r.Method == http.MethodPut {
-				var urlp *url.URL
-				urlp, err = url.Parse(strings.Replace(r.URL.String(), c.WebDavURL, "", 1))
-				if err != nil {
-					return code, err
-				}
-
-				fi, code, err = file.GetInfo(urlp, c, user)
-				if err != nil {
-					return code, err
-				}
-
-				if handlers.PreProccessPUT(w, r, c, user, fi) != nil {
+				if handlers.PreProccessPUT(w, r, c, user) != nil {
 					return http.StatusInternalServerError, err
 				}
 			}
diff --git a/handlers/put.go b/handlers/put.go
index 61352352..26909f34 100644
--- a/handlers/put.go
+++ b/handlers/put.go
@@ -11,7 +11,6 @@ import (
 	"strings"
 
 	"github.com/hacdias/caddy-filemanager/config"
-	"github.com/hacdias/caddy-filemanager/file"
 	"github.com/spf13/hugo/parser"
 )
 
@@ -21,7 +20,6 @@ func PreProccessPUT(
 	r *http.Request,
 	c *config.Config,
 	u *config.User,
-	i *file.Info,
 ) (err error) {
 	var (
 		data      = map[string]interface{}{}
@@ -43,7 +41,7 @@ func PreProccessPUT(
 
 	switch kind {
 	case "frontmatter-only":
-		if file, err = ParseFrontMatterOnlyFile(data, i.FileInfo.Name()); err != nil {
+		if file, err = ParseFrontMatterOnlyFile(data, r.URL.Path); err != nil {
 			return
 		}
 	case "content-only":
@@ -51,7 +49,7 @@ func PreProccessPUT(
 		mainContent = strings.TrimSpace(mainContent)
 		file = []byte(mainContent)
 	case "complete":
-		if file, err = ParseCompleteFile(data, i.Name(), u.FrontMatter); err != nil {
+		if file, err = ParseCompleteFile(data, r.URL.Path, u.FrontMatter); err != nil {
 			return
 		}
 	default: