diff --git a/epicardium/ble/epic_att_api.c b/epicardium/ble/epic_att_api.c
index bcdd420ad00337039f366ef33c5bb609782960fc..3cd3ebf2be38d7b14ef7a004d96cd2eb297601c1 100644
--- a/epicardium/ble/epic_att_api.c
+++ b/epicardium/ble/epic_att_api.c
@@ -41,6 +41,7 @@ void ble_epic_att_api_event(attEvt_t *att_event)
 		if (e) {
 			memcpy(e, att_event, sizeof(*e));
 			memcpy(e + 1, att_event->pValue, value_len);
+			e->pValue = (uint8_t *)(e + 1);
 			ble_epic_ble_api_trigger_event(BLE_EVENT_ATT_EVENT, e);
 		} else {
 			LOG_WARN(
diff --git a/epicardium/ble/epic_ble_api.c b/epicardium/ble/epic_ble_api.c
index cf27adc0f237f650c3acabeaa38e4aab6df53f34..eb3d54e95a2a7c24c90d88552ae7fab5f05f2a02 100644
--- a/epicardium/ble/epic_ble_api.c
+++ b/epicardium/ble/epic_ble_api.c
@@ -2,7 +2,7 @@
 
 #include "epicardium.h"
 #include "modules/log.h"
-#include "api/interrupt-sender.h"
+#include "modules/modules.h"
 
 #include "wsf_buf.h"
 #include "app_api.h"
@@ -59,7 +59,7 @@ void ble_epic_ble_api_trigger_event(enum epic_ble_event_type type, void *data)
 			epic_ble_free_event(&e);
 		}
 
-		api_interrupt_trigger(EPIC_INT_BLE);
+		interrupt_trigger(EPIC_INT_BLE);
 	} else {
 		epic_ble_free_event(&e);
 	}