diff --git a/lib/cmis_repository_wrapper.php b/lib/cmis_repository_wrapper.php
index 5247e98..473a96f 100644
--- a/lib/cmis_repository_wrapper.php
+++ b/lib/cmis_repository_wrapper.php
@@ -420,7 +420,7 @@
     
     function handleSpaces($path)
     {
-        return $this->do_not_urlencode ? $path : str_replace(" ","%20",str_replace("%","%25",$path));
+        return $this->do_not_urlencode ? $path : rawurlencode($path);
     }
 
     static function extractTypeDef($xmldata)