diff --git a/src/capwap/dtls_openssl_connect.c b/src/capwap/dtls_openssl_connect.c
index d2478644..f5e9b70a 100644
--- a/src/capwap/dtls_openssl_connect.c
+++ b/src/capwap/dtls_openssl_connect.c
@@ -47,11 +47,15 @@ int dtls_openssl_connect(struct conn * conn)
 	if (!d)
 		return 0;
 
-	SSL_set_psk_client_callback( d->ssl, psk_client_cb);
+	if (conn->dtls_psk)
+		SSL_set_psk_client_callback( d->ssl, psk_client_cb);
+
+	if (conn->dtls_cert_file && conn->dtls_key_file){
+	}
 
 	char errstr[256];
 	int rc; 
-	do{ 
+//	do{ 
 		rc = SSL_connect(d->ssl);
 
 
@@ -82,7 +86,7 @@ int dtls_openssl_connect(struct conn * conn)
 
 		rc = dtls_openssl_log_error(d->ssl,rc,"DTLS connect");
 	       
-	} while (rc == 0 );
+//	} while (rc == 0 );
 
 //	printf("DTLS connect RC: %i\n",rc);