diff --git a/lib/UrlResolver.php b/lib/UrlResolver.php
index a6344e8..c5172cd 100755
--- a/lib/UrlResolver.php
+++ b/lib/UrlResolver.php
@@ -185,6 +185,7 @@ public function path($path, $base = true, $cdn = true, $cacheBust = true)
         $path = $path->toReal();
 
         $url = $path->toRelative($this->_baseDir);
+        $url = implode('/', array_map('rawurlencode', explode('/', $url)));
         if ($base) {
             if ($cdn && isset($this->_cdnUrl)) {
                 $url = $this->_cdnUrl . $url;
@@ -192,8 +193,7 @@ public function path($path, $base = true, $cdn = true, $cacheBust = true)
                 $url = $this->_baseUrl . $url;
             }
         }
-        $url = implode('/', array_map('rawurlencode', explode('/', $url)));
-        $url = (new \Coast\Url())->path($url);
+        $url = new \Coast\Url($url);
 
         if ($cacheBust && isset($this->_cacheBust) && $path instanceof \Coast\File && $path->isReadable()) {
             call_user_func($this->_cacheBust, $url, $path);