diff --git a/pym/cl_ldap.py b/pym/cl_ldap.py
index 8cc7c1e..0178857 100644
--- a/pym/cl_ldap.py
+++ b/pym/cl_ldap.py
@@ -14935,7 +14935,6 @@ with another option."))
         attributes = [x[0] for x in data]
         retrAttrs = [x[1] for x in data]
         retClVars = False
-        #TODO check encoding
         searchRes = self.getQueryLDAP(service, "computers", searchAttr,
                                       searchStr, retrAttrs)
         if searchRes == False:
@@ -14960,14 +14959,14 @@ with another option."))
                             data.append((attrName, value))
                             flagFirst = True
                         else:
-                            data.append(("", value.decode("UTF-8")))
+                            data.append(("", value))
                     if service == "samba" and attr == "gidNumber":
                         memberGroups = self._getUserMemberGroups(machName,
                                                                  service)
                         attrApp = _("Supplementary groups")
                         if service == "samba":
                             if value:
-                                memberGroups.insert(0, value.decode("UTF-8"))
+                                memberGroups.insert(0, value)
                         flagFirst = False
                         for member_group in memberGroups:
                             if not flagFirst: