diff --git a/optipic/ImgUrlConverter.php b/optipic/ImgUrlConverter.php
index 4c9ac57..0b867e2 100644
--- a/optipic/ImgUrlConverter.php
+++ b/optipic/ImgUrlConverter.php
@@ -429,7 +429,8 @@ public static function getUrlFromRelative($relativeUrl, $baseUrl=false) {
         }
         
         if(!$baseUrl) {
-            $baseUrl = pathinfo($_SERVER['REQUEST_URI'], PATHINFO_DIRNAME);
+            //$baseUrl = pathinfo($_SERVER['REQUEST_URI'], PATHINFO_DIRNAME);
+            $baseUrl = self::getBaseDirOfUrl($_SERVER['REQUEST_URI']);
         }
         $baseUrl .= '/';
         $url = str_replace('//', '/', $baseUrl.$relativeUrl);
@@ -444,11 +445,13 @@ public static function getUrlFromRelative($relativeUrl, $baseUrl=false) {
      * https://domain.com/catalog/catalog.php --> https://domain.com/catalog/
      */
     public static function getBaseDirOfUrl($url) {
-        $pathinfo = pathinfo($url);
+        $urlParsed = parse_url($url);
+        $urlPath = $urlParsed['path'];
+        $pathinfo = pathinfo($urlPath);
         if(!empty($pathinfo['extension'])) {
             return $pathinfo['dirname'];
         }
-        return $url;
+        return $urlPath;
     }
     
     public static function getBaseUrlFromHtml($html) {
diff --git a/optipic/optipic.php b/optipic/optipic.php
index 7a4742e..6829675 100644
--- a/optipic/optipic.php
+++ b/optipic/optipic.php
@@ -50,7 +50,7 @@ function onAfterRender()
                     $uri = JUri::getInstance(); 
                     $host = $uri->getHost();
  
-                    $js = '<script src="https://optipic.io/api/cp/stat?domain='.$host.'&sid='.$sid.'&cms=joomla&stype=cdn&append_to=%23general%3Afirst&version=1.14.0"></script>';
+                    $js = '<script src="https://optipic.io/api/cp/stat?domain='.$host.'&sid='.$sid.'&cms=joomla&stype=cdn&append_to=%23general%3Afirst&version=1.14.1"></script>';
                     
                     $bodyHtml = str_replace ("</body>", $js." </body>", $bodyHtml);
                     $app->setBody($bodyHtml);
diff --git a/optipic/optipic.xml b/optipic/optipic.xml
index 9f6d113..d9d26d9 100644
--- a/optipic/optipic.xml
+++ b/optipic/optipic.xml
@@ -7,7 +7,7 @@
     <license>GNU General Public License version 2 or later</license>
     <authorEmail>info@optipic.io</authorEmail>
     <authorUrl>https://optipic.io/cdn/</authorUrl>
-    <version>1.14.0</version>
+    <version>1.14.1</version>
     <description>PLG_SYSTEM_OPTIPIC_DESC</description>
     <files>
         <filename plugin="optipic">optipic.php</filename>