diff --git a/WiFi/WiFiClient.cpp b/WiFi/WiFiClient.cpp
index 075af56c9..c85ea4217 100755
--- a/WiFi/WiFiClient.cpp
+++ b/WiFi/WiFiClient.cpp
@@ -44,7 +44,8 @@ int WiFiClient::connect(IPAddress ip, uint16_t port) {
     if (_sock != NO_SOCKET_AVAIL)
     {
     	ServerDrv::startClient(uint32_t(ip), port, _sock);
-    	 WiFiClass::_state[_sock] = _sock;
+    	WiFiClass::_state[_sock] = _sock;
+    	while(!connected());
     }else{
     	return 0;
     }
diff --git a/WiFi/utility/server_drv.cpp b/WiFi/utility/server_drv.cpp
index 7b5194089..c11e94109 100644
--- a/WiFi/utility/server_drv.cpp
+++ b/WiFi/utility/server_drv.cpp
@@ -1,3 +1,5 @@
+//#define _DEBUG_
+
 #include "server_drv.h"
 
 #include "Arduino.h"