diff --git a/apps/pair.py b/apps/pair.py
index 7f89629..78967b4 100644
--- a/apps/pair.py
+++ b/apps/pair.py
@@ -149,9 +149,9 @@ async def get_peer_name(peer, mode):
         if not services:
             return None
 
-        values = await peer.read_characteristics_by_uuid(GATT_DEVICE_NAME_CHARACTERISTIC, services[0])
-        if values:
-            return values[0].decode('utf-8')
+        characteristics = await peer.read_characteristics_by_uuid(GATT_DEVICE_NAME_CHARACTERISTIC, services[0])
+        if characteristics:
+            return characteristics[0][1].decode('utf-8')
 
 
 # -----------------------------------------------------------------------------
diff --git a/bumble/gatt_client.py b/bumble/gatt_client.py
index 1ba1e2a..d61120b 100644
--- a/bumble/gatt_client.py
+++ b/bumble/gatt_client.py
@@ -712,7 +712,7 @@ class Client:
                     logger.warning(f'bogus handle value: {attribute_handle}')
                     return []
 
-                characteristics_values.append(attribute_value)
+                characteristics_values.append((attribute_handle, attribute_value))
 
             # Move on to the next characteristics
             starting_handle = response.attributes[-1][0] + 1