diff --git a/src/disk/hdc.c b/src/disk/hdc.c
index 90d46a815..7ba9a0f1e 100644
--- a/src/disk/hdc.c
+++ b/src/disk/hdc.c
@@ -202,7 +202,7 @@ hdc_has_config(int hdc)
 
     if (dev == NULL) return(0);
 
-    if (dev->config == NULL) return(0);
+    if (!device_has_config(dev)) return(0);
 
     return(1);
 }
diff --git a/src/floppy/fdc.c b/src/floppy/fdc.c
index 171a77fa7..a28328587 100644
--- a/src/floppy/fdc.c
+++ b/src/floppy/fdc.c
@@ -154,7 +154,7 @@ fdc_card_has_config(int card)
 {
     if (! fdc_cards[card].device) return(0);
 
-    return(fdc_cards[card].device->config ? 1 : 0);
+    return(device_has_config(fdc_cards[card].device) ? 1 : 0);
 }
 
 
diff --git a/src/scsi/scsi.c b/src/scsi/scsi.c
index cf6f0207e..675abff26 100644
--- a/src/scsi/scsi.c
+++ b/src/scsi/scsi.c
@@ -153,7 +153,7 @@ scsi_card_has_config(int card)
 {
     if (! scsi_cards[card].device) return(0);
 
-    return(device_had_config(scsi_cards[card].device) ? 1 : 0);
+    return(device_has_config(scsi_cards[card].device) ? 1 : 0);
 }