diff --git a/ble/gatt_client.h b/ble/gatt_client.h
index c98328173..c653b4759 100644
--- a/ble/gatt_client.h
+++ b/ble/gatt_client.h
@@ -45,6 +45,13 @@
 extern "C" {
 #endif
 
+typedef struct le_event {
+    uint8_t   type;
+    uint16_t handle;
+} le_event_t;
+
+typedef void (*gatt_client_callback_t)(le_event_t * event);
+
 typedef enum {
     P_READY,
     P_W2_SEND_SERVICE_QUERY,
@@ -168,11 +175,6 @@ typedef struct gatt_subclient {
 
 /* API_START */
 
-typedef struct le_event {
-    uint8_t   type;
-    uint16_t handle;
-} le_event_t;
-
 typedef struct gatt_complete_event{
     uint8_t   type;
     uint16_t handle;
@@ -232,8 +234,6 @@ typedef struct le_characteristic_descriptor_event{
     uint8_t * value;
 } le_characteristic_descriptor_event_t;
 
-typedef void (*gatt_client_callback_t)(le_event_t * event);
-
 // Set up GATT client.
 void gatt_client_init();
 
diff --git a/platforms/posix/src/daemon.c b/platforms/posix/src/daemon.c
index 90f33ceb0..466ff42b1 100644
--- a/platforms/posix/src/daemon.c
+++ b/platforms/posix/src/daemon.c
@@ -603,7 +603,7 @@ linked_list_gatt_client_helper_t * daemon_setup_gatt_client_request(connection_t
     
     if (track_active_connection){
         // remember connection responsible for this request
-        gatt_helper->active_connection = connection;
+        helper->active_connection = connection;
     }
 
     return helper;