diff --git a/libraries/BluetoothSerial/src/BTScan.h b/libraries/BluetoothSerial/src/BTScan.h
index 3650d41625b..2851fdd3626 100644
--- a/libraries/BluetoothSerial/src/BTScan.h
+++ b/libraries/BluetoothSerial/src/BTScan.h
@@ -24,14 +24,14 @@ class BTScanResults {
 
     virtual void        		dump(Print *print = nullptr);
     virtual int         		getCount();
-    virtual BTAdvertisedDevice* getDevice(uint32_t i);
+    virtual BTAdvertisedDevice* getDevice(int i);
 };
 
 class BTScanResultsSet : public BTScanResults {
 public:
     void                	dump(Print *print = nullptr);
     int                 	getCount();
-    BTAdvertisedDevice*		getDevice(uint32_t i);
+    BTAdvertisedDevice*		getDevice(int i);
 
 	bool add(BTAdvertisedDeviceSet advertisedDevice, bool unique = true);
 	void clear();
@@ -39,4 +39,4 @@ class BTScanResultsSet : public BTScanResults {
     std::map<std::string, BTAdvertisedDeviceSet> m_vectorAdvertisedDevices;
 };
 
-#endif
\ No newline at end of file
+#endif
diff --git a/libraries/BluetoothSerial/src/BTScanResultsSet.cpp b/libraries/BluetoothSerial/src/BTScanResultsSet.cpp
index 79d23e463cd..e347228c848 100644
--- a/libraries/BluetoothSerial/src/BTScanResultsSet.cpp
+++ b/libraries/BluetoothSerial/src/BTScanResultsSet.cpp
@@ -63,11 +63,11 @@ int BTScanResultsSet::getCount() {
  * @param [in] i The index of the device.
  * @return The device at the specified index.
  */
-BTAdvertisedDevice* BTScanResultsSet::getDevice(uint32_t i) {
+BTAdvertisedDevice* BTScanResultsSet::getDevice(int i) {
 	if (i < 0)
 		return nullptr;
 
-	uint32_t x = 0;
+	int x = 0;
 	BTAdvertisedDeviceSet* pDev = &m_vectorAdvertisedDevices.begin()->second;
 	for (auto it = m_vectorAdvertisedDevices.begin(); it != m_vectorAdvertisedDevices.end(); it++) {
 		pDev = &it->second;
@@ -92,4 +92,4 @@ bool BTScanResultsSet::add(BTAdvertisedDeviceSet advertisedDevice, bool unique)
 		return false;
 }
 
-#endif
\ No newline at end of file
+#endif