diff --git a/ChangeLog b/ChangeLog
index 611e20d8..ac7f5fee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,9 @@ file not just like Linux.
 * Added ability to change charset on terminal only if
 it's build in command on win32.
 
+* Fixed bug with testing mode. If was same arguments,
+Cloud Commander works in testing mode and server do not
+started.
 
 2012.10.01, Version 0.1.7
 
diff --git a/server.js b/server.js
index c725eb66..11e993bd 100644
--- a/server.js
+++ b/server.js
@@ -176,8 +176,12 @@ CloudServer.start = function (pConfig) {
         !process.env.HOME.indexOf('/opt/haibu')) {
             this.IP = '0.0.0.0';
     }
+    
+    
+    console.log(process.argv);
+    console.log(this.Config);
     /* server mode or testing mode */
-    if (!process.argv[2] && this.Config.server) {
+    if (this.Config.server) {
         var http = require('http');
 
         try {
@@ -193,9 +197,8 @@ CloudServer.start = function (pConfig) {
             console.log('Cloud Commander server could not started');
             console.log(pError);
         }
-    }else{
+    }else
         console.log('Cloud Commander testing mode');
-    }    
 };