Use 'wait for a device' when connecting to fix false negative