diff --git a/module.json b/module.json
index a82aeb8..c814e1b 100644
--- a/module.json
+++ b/module.json
@@ -15,8 +15,8 @@
   "homepage": "https://developer.mbed.org/teams/Lancaster-University/code/microbit/",
   "dependencies": {
     "mbed-classic": "lancaster-university/mbed-classic#microbit_hfclk",
-    "ble": "lancaster-university/BLE_API#v2.5.0+mb",
-    "ble-nrf51822": "lancaster-university/nrf51822#v2.5.0+mb2",
+    "ble": "lancaster-university/BLE_API#v2.5.0+mb2",
+    "ble-nrf51822": "lancaster-university/nrf51822#v2.5.0+mb4",
     "nrf51-sdk": "lancaster-university/nrf51-sdk#v2.2.0+mb2"
   },
   "extraIncludes": [
diff --git a/source/ble-services/MicroBitBLEManager.cpp b/source/ble-services/MicroBitBLEManager.cpp
index 77f9e7c..757a47d 100644
--- a/source/ble-services/MicroBitBLEManager.cpp
+++ b/source/ble-services/MicroBitBLEManager.cpp
@@ -330,7 +330,7 @@ int MicroBitBLEManager::getBondCount()
     whitelist.capacity = MICROBIT_BLE_MAXIMUM_BONDS;
     ble->securityManager().getAddressesFromBondTable(whitelist);
 
-    return whitelist.size;
+    return whitelist.bonds;
 }
 
 /**