diff --git a/lib/server/socket.js b/lib/server/socket.js
index b77f8d34..395623d5 100644
--- a/lib/server/socket.js
+++ b/lib/server/socket.js
@@ -293,6 +293,7 @@
     
     function onCD(pCommand, currDir, callback) {
         var dir,
+            getDir      = WIN32 ? 'chdir' : 'pwd',
             paramDir    = Util.removeStr(pCommand, 'cd ');
         
         if (equalPart(paramDir, ['/', '~', '.']))
@@ -302,7 +303,7 @@
         
         console.log(dir, paramDir);
         
-        exec('cd ' + dir + ' && pwd', function (error, stdout, stderr) {
+        exec('cd ' + dir + ' && ' + getDir, function (error, stdout, stderr) {
             var lRet,
                 lMsg    = '',
                 lError = error || stderr;