diff --git a/gps/core/data-items/DataItemConcreteTypes.cpp b/gps/core/data-items/DataItemConcreteTypes.cpp
index 3142ffe..6ea3905 100644
--- a/gps/core/data-items/DataItemConcreteTypes.cpp
+++ b/gps/core/data-items/DataItemConcreteTypes.cpp
@@ -485,11 +485,11 @@ void BtLeDeviceScanDetailsDataItem::stringify(string& valueStr) {
         valueStr += d->mApSrnRssi;
         valueStr += ", ";
 
-        char t[10];
-        memset (t, '\0', 10);
+        char t[20];
+        memset (t, '\0', 20);
         valueStr += BTLESCANDETAILS_FIELD_MAC;
         valueStr += ": ";
-        snprintf(t, 10, "[%02x:%02x:%02x:%02x:%02x:%02x]", d->mApSrnMacAddress[0],
+        snprintf(t, 20, "[%02x:%02x:%02x:%02x:%02x:%02x]", d->mApSrnMacAddress[0],
                 d->mApSrnMacAddress[1], d->mApSrnMacAddress[2], d->mApSrnMacAddress[3],
                 d->mApSrnMacAddress[4], d->mApSrnMacAddress[5]);
         valueStr += t;
@@ -534,11 +534,11 @@ void BtDeviceScanDetailsDataItem::stringify(string& valueStr) {
         valueStr += d->mApSrnRssi;
         valueStr += ", ";
 
-        char t[10];
-        memset (t, '\0', 10);
+        char t[20];
+        memset (t, '\0', 20);
         valueStr += BTSCANDETAILS_FIELD_MAC;
         valueStr += ": ";
-        snprintf(t, 10, "[%02x:%02x:%02x:%02x:%02x:%02x]", d->mApSrnMacAddress[0],
+        snprintf(t, 20, "[%02x:%02x:%02x:%02x:%02x:%02x]", d->mApSrnMacAddress[0],
                 d->mApSrnMacAddress[1], d->mApSrnMacAddress[2], d->mApSrnMacAddress[3],
                 d->mApSrnMacAddress[4], d->mApSrnMacAddress[5]);
         valueStr += t;