diff --git a/cli.php b/cli.php
index 7c9ffc4..aa30f0c 100644
--- a/cli.php
+++ b/cli.php
@@ -202,11 +202,21 @@ class cli
     // (Array management in CLI)
     foreach ($argv as $key=>$arg)
     {
-      $val = null;
-      parse_str ($arg, $val);
-      if (count ($val) === 1 && reset ($val) === "")
-        $val = $arg;
-      $argv[$key] = $val;
+      $pairs = explode('&', $arg);
+
+      foreach($pairs as $pair) {
+        @list ($name, $value) = explode ('=', $pair, 2);
+        if ($value === null)
+        {
+          $argv[$key] = $name;
+        }
+        else
+        {
+          if (! is_array ($argv[$key]))
+            $argv[$key] = array ();
+          $argv[$key][$name] = $value;
+        }
+      }
     }
 
     // Manage a parameter in the constructor of the class