diff --git a/src/App/Template/SupportTrait.php b/src/App/Template/SupportTrait.php
index <HASH>..<HASH> 100644
--- a/src/App/Template/SupportTrait.php
+++ b/src/App/Template/SupportTrait.php
@@ -132,16 +132,19 @@ trait SupportTrait
     /**
      * Prepend the base URI to the given path.
      *
-     * @param  string $path A URI path to wrap.
+     * @param  string $uri A URI path to wrap.
      * @return UriInterface
      */
-    public function withBaseUrl($path)
+    public function withBaseUrl($uri)
     {
-        $uri  = $this->baseUrl();
-        $path = strval($path);
-        if ($path && strpos($path, ':') === false && !in_array($path[0], [ '/', '#', '?' ])) {
-            return $uri->withPath($path);
+        $uri = strval($uri);
+        if ($uri && !parse_url($uri, PHP_URL_SCHEME)) {
+            if (!in_array($uri[0], [ '/', '#', '?' ])) {
+                return $this->baseUrl()->withPath($uri);
+            }
         }
+
+        return $uri;
     }
 
     /**
Improvements to SupportTrait::withBaseUrl()