Fixed: Device Discover hangs