diff --git a/lib/server/commander.js b/lib/server/commander.js
index a60de45d..0097ed1f 100644
--- a/lib/server/commander.js
+++ b/lib/server/commander.js
@@ -152,34 +152,31 @@
             
             json.files = changeOrder(files);
             
-            changeUIDToName(json, function() {
-                Util.exec(p.callback, null, json);
+            changeUIDToName(json, function(error) {
+                p.callback(error, json);
             });
         }
     }
     
     function changeUIDToName(json, callback) {
-        Util.exec.if(WIN32, callback, 
-            function(callback) {
-                users.getNames(function(error, names) {
-                    var i, n, current, owner,
-                        files = json.files;
+        if (WIN32)
+            callback();
+        else
+            users.getNames(function(error, names) {
+                var files = json.files;
+                
+                if (error)
+                    callback(error);
+                else
+                    files.forEach(function(file) {
+                        var owner   = file.owner;
+                            owner   = names[owner];
                     
-                    Util.log(error);
-                    
-                    n = files.length;
-                    for (i = 0; i < n; i++) {
-                        current         = files[i];
-                        
-                        owner           = current.owner;
-                        owner           = names[owner];
-                        
                         if (owner)
-                            current.owner   = owner;
-                    }
-                    
-                    Util.exec(callback);
-                });
+                            file.owner   = owner;
+                    });
+                
+                callback();
             });
     }