diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3af3c6202627ff2fc05487261e8b929ce6ae35c3..f3def1f81912515a791ca538716caa62b3eb9e8a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,7 @@ project(cellframe-sdk C)
 cmake_minimum_required(VERSION 3.0)
 
 set(CMAKE_C_STANDARD 11)
-set(CELLFRAME_SDK_NATIVE_VERSION "2.9-1")
+set(CELLFRAME_SDK_NATIVE_VERSION "2.9-2")
 add_definitions ("-DCELLFRAME_SDK_VERSION=\"${CELLFRAME_SDK_NATIVE_VERSION}\"")
 set(DAPSDK_MODULES "")
 message("Cellframe modules: ${CELLFRAME_MODULES}")
diff --git a/dap-sdk/CMakeLists.txt b/dap-sdk/CMakeLists.txt
index b59160cb13fd9d12b6e77d6a5ad637d561cecab1..3641b9c2383c4d9449dacfab48aac53b7d3a5aa0 100644
--- a/dap-sdk/CMakeLists.txt
+++ b/dap-sdk/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(DAP_SDK_NATIVE_VERSION "2.1-0")
+set(DAP_SDK_NATIVE_VERSION "2.2-1")
 # Core, add it always
 add_subdirectory(core)
 if (DAPSDK_MODULES MATCHES "crypto")
diff --git a/dap-sdk/net/core/dap_server.c b/dap-sdk/net/core/dap_server.c
index 2fd5a294b389e6966e061e664e0f598ad1271a9f..8b1a7f92757bc640c3498244e1c932d95336e4c6 100644
--- a/dap-sdk/net/core/dap_server.c
+++ b/dap-sdk/net/core/dap_server.c
@@ -239,9 +239,13 @@ static int s_server_run(dap_server_t * a_server, dap_events_socket_callbacks_t *
 {
     assert(a_server);
 
+#ifdef DAP_OS_WINDOWS
+    struct sockaddr * l_listener_addr = (struct sockaddr *) &(a_server->listener_addr);
+#else
     struct sockaddr * l_listener_addr = a_server->type == SERVER_LOCAL ?
                                         (struct sockaddr *) &(a_server->listener_path) :
                                         (struct sockaddr *) &(a_server->listener_addr);
+#endif
     socklen_t l_listener_addr_len = a_server->type == SERVER_LOCAL ?
                                         sizeof(a_server->listener_path) :
                                         sizeof(a_server->listener_addr);