diff --git a/includes/class/ApiHandler.php b/includes/class/ApiHandler.php
index f21a0ac..07b6cdf 100644
--- a/includes/class/ApiHandler.php
+++ b/includes/class/ApiHandler.php
@@ -91,15 +91,8 @@ class ApiHandler {
                 break;
         }
 
-        $this->url = str_replace($this->apiurl, '', $this->url);
         curl_setopt($this->curlh, CURLOPT_URL, $this->baseurl().$this->url);
 
-        //print "Here we go:\n";
-        //print "Request: ".$this->method.' '.$this->baseurl().$this->url."\n";
-        //if ($this->content != '') {
-        //    print "Content: ".$this->content."\n";
-        //}
-
         $return = curl_exec($this->curlh);
         $code = curl_getinfo($this->curlh, CURLINFO_HTTP_CODE);
         $json = json_decode($return, 1);
@@ -117,12 +110,11 @@ class ApiHandler {
     }
 
     public function call() {
-        if (substr($this->url, 0, 1) == '/') {
-            $this->apiurl();
-        } else {
-            $this->apiurl = '/';
+        if (substr($this->url, 0, 1) != '/') {
+            $this->url = '/'.$this->url;
         }
-
+        $this->apiurl();
+        $this->url = str_replace($this->apiurl, '', $this->url);
         $this->go();
     }
 }