diff --git a/src/cli/document/crawl.php b/src/cli/document/crawl.php
index 7ba3434..badea88 100644
--- a/src/cli/document/crawl.php
+++ b/src/cli/document/crawl.php
@@ -311,15 +311,23 @@ foreach($index->search('')
 
                 if ($url = $link->getAddress())
                 {
-                    //Make relative links absolute
-                    $url = \Yggverse\YoTools\Link::relative2absolute(
-                        $document->get('url'),
-                        $url,
-                        $scheme,
-                        $host,
-                        $port,
+                    // Convert relative links to absolute
+                    $address = new \Yggverse\Net\Address(
+                        $url
                     );
 
+                    if ($address->isRelative())
+                    {
+                        $base = new \Yggverse\Net\Address(
+                            $document->get('url')
+                        );
+
+                        if ($absolute = $address->getAbsolute($base))
+                        {
+                            $url = $absolute;
+                        }
+                    }
+
                     // Regex rules
                     if (!preg_match($config->cli->document->crawl->url->regex, $url))
                     {