diff --git a/src/kits/bluetooth/RemoteDevice.cpp b/src/kits/bluetooth/RemoteDevice.cpp
index 2349853ac2..41bc285b02 100644
--- a/src/kits/bluetooth/RemoteDevice.cpp
+++ b/src/kits/bluetooth/RemoteDevice.cpp
@@ -160,8 +160,7 @@ RemoteDevice::RemoteDevice(bdaddr_t address)
 
 RemoteDevice::RemoteDevice(BString address)
 {
-   /* TODO */
-
+	fBdaddr = bdaddrUtils::FromString((const char *)address.String());
 }
 
 
@@ -180,11 +179,11 @@ RemoteDevice::GetProperty(const char* property, uint32* value) /* Throwing */
 }
 
 
-}
-
-
 DeviceClass
 RemoteDevice::GetDeviceClass()
 {
 	return fDeviceClass;
 }
+
+
+}