Fix device discovery go to confusion when send/receive message