diff --git a/lib/server/commander.js b/lib/server/commander.js
index d5b3d2bb..72a03af9 100644
--- a/lib/server/commander.js
+++ b/lib/server/commander.js
@@ -152,34 +152,35 @@
             
             json.files = changeOrder(files);
             
-            changeUIDToName(json, function(json) {
+            changeUIDToName(json, function() {
                 Util.exec(p.callback, null, json);
             });
         }
     }
     
     function changeUIDToName(json, callback) {
-        Util.ifExec(WIN32, callback, function() {
-            users.getNames(function(error, names) {
-                var i, n, current, owner,
-                    files = json.files;
-                
-                Util.log(error);
-                
-                n = files.length;
-                for (i = 0; i < n; i++) {
-                    current         = files[i];
+        Util.ifExec(WIN32, callback, 
+            function(callback) {
+                users.getNames(function(error, names) {
+                    var i, n, current, owner,
+                        files = json.files;
                     
-                    owner           = current.owner;
-                    owner           = names[owner];
+                    Util.log(error);
                     
-                    if (owner)
-                        current.owner   = owner;
-                }
-                
-                Util.exec(callback, json);
+                    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);
+                });
             });
-        });
     }