diff --git a/vnc-client/src/main.c b/vnc-client/src/main.c
index 7289089..6461fd6 100644
--- a/vnc-client/src/main.c
+++ b/vnc-client/src/main.c
@@ -305,9 +305,9 @@ void monitor_update(struct monitor *mon, int mon_id)
             struct fxlink_device *fdev = &app.devices.devices[i];
             char const *id = fxlink_device_id(fdev);
 
-            if(fdev->status != FXLINK_FDEV_STATUS_IDLE || !fdev->comm)
+            if(!fxlink_device_ready_to_connect(fdev))
                 continue;
-            if(fdev->comm->ep_bulk_IN == 0xff) {
+            if(!fxlink_device_has_fxlink_interface(fdev)) {
                 hlog("cgvm");
                 log_("ignoring %s: no fxlink interface\n", id);
                 continue;