diff --git a/example/embedded/gatt_battery_query.c b/example/embedded/gatt_battery_query.c
index e4ccfd187..f3762ca39 100644
--- a/example/embedded/gatt_battery_query.c
+++ b/example/embedded/gatt_battery_query.c
@@ -203,17 +203,13 @@ static void fill_advertising_report_from_packet(advertising_report_t * report, u
     int pos = 2;
     report->event_type = packet[pos++];
     report->address_type = packet[pos++];
-    memcpy(report->address, &packet[pos], 6);
+    bt_flip_addr(report->address, &packet[pos]);
     pos += 6;
     report->rssi = packet[pos++];
     report->length = packet[pos++];
     report->data = &packet[pos];
     pos += report->length;
     dump_advertising_report(report);
-    
-    bd_addr_t found_device_addr;
-    memcpy(found_device_addr, report->address, 6);
-    swapX(found_device_addr, report->address, 6);
 }
 
 static void handle_hci_event(void * connection, uint8_t packet_type, uint16_t channel, uint8_t *packet, uint16_t size){
diff --git a/example/embedded/gatt_browser.c b/example/embedded/gatt_browser.c
index 60f81964d..b0a2a39f1 100644
--- a/example/embedded/gatt_browser.c
+++ b/example/embedded/gatt_browser.c
@@ -160,17 +160,13 @@ static void fill_advertising_report_from_packet(advertising_report_t * report, u
     int pos = 2;
     report->event_type = packet[pos++];
     report->address_type = packet[pos++];
-    memcpy(report->address, &packet[pos], 6);
+    bt_flip_addr(report->address, &packet[pos]);
     pos += 6;
     report->rssi = packet[pos++];
     report->length = packet[pos++];
     report->data = &packet[pos];
     pos += report->length;
     dump_advertising_report(report);
-    
-    bd_addr_t found_device_addr;
-    memcpy(found_device_addr, report->address, 6);
-    swapX(found_device_addr, report->address, 6);
 }
 
 
diff --git a/test/pts/ble_central_test.c b/test/pts/ble_central_test.c
index 4b3349fb0..accc5ad1e 100644
--- a/test/pts/ble_central_test.c
+++ b/test/pts/ble_central_test.c
@@ -134,17 +134,13 @@ static void fill_advertising_report_from_packet(advertising_report_t * report, u
     int pos = 2;
     report->event_type = packet[pos++];
     report->address_type = packet[pos++];
-    memcpy(report->address, &packet[pos], 6);
+    bt_flip_addr(report->address, &packet[pos]);
     pos += 6;
     report->rssi = packet[pos++];
     report->length = packet[pos++];
     report->data = &packet[pos];
     pos += report->length;
     dump_advertising_report(report);
-    
-    bd_addr_t found_device_addr;
-    memcpy(found_device_addr, report->address, 6);
-    swapX(found_device_addr, report->address, 6);
 }
 
 static void gap_run(void){