diff --git a/include/class_ldap.inc b/include/class_ldap.inc
index 7e1f6bd23b72ed4ee92249d90906875a48fd4541..349a7ae189c407e206b7f7d59833574d1f236bef 100644
--- a/include/class_ldap.inc
+++ b/include/class_ldap.inc
@@ -703,7 +703,8 @@ class LDAP
       $delarray = array();
 
       /* Get sorted list of dn's to delete */
-      $this->ls($srp, "(objectClass=*)", $deletedn);
+      $this->cd($deletedn);
+      $this->search($srp, "(objectClass=*)");
       while ($this->fetch($srp)) {
         $deldn            = $this->getDN($srp);
         $delarray[$deldn] = strlen($deldn);
@@ -713,11 +714,8 @@ class LDAP
 
       /* Really Delete ALL dn's in subtree */
       foreach (array_keys($delarray) as $key) {
-        $this->rmdir_recursive($srp, $key);
+        $r = @ldap_delete($this->cid, LDAP::fix($key));
       }
-
-      /* Finally Delete own Node */
-      $r = @ldap_delete($this->cid, LDAP::fix($deletedn));
       $this->error = @ldap_error($this->cid);
       return ($r ? $r : 0);
     } else {
diff --git a/include/class_ldapMultiplexer.inc b/include/class_ldapMultiplexer.inc
index 027abeb6da034ec71700dac5f26e6542e7f1b739..f7faa9e23930a5ac561670fbf82d6294d3bdb8cb 100644
--- a/include/class_ldapMultiplexer.inc
+++ b/include/class_ldapMultiplexer.inc
@@ -64,10 +64,7 @@ class ldapMultiplexer {
       array_unshift($parameters, $this->sr);
     }
 
-    $class  = new ReflectionClass($this->object);
-    $method = $class->getMethod($methodName);
-
-    return $method->invokeArgs($this->object, $parameters);
+    return call_user_func_array(array($this->object, $methodName), $parameters);
   }
 
   /*