diff -r 666ad3a50f9f -r ea3eb4c74c1b master/master.c
--- a/master/master.c	Tue Apr 20 11:21:43 2010 +0200
+++ b/master/master.c	Fri Apr 23 16:42:27 2010 +0200
@@ -1526,7 +1526,7 @@
         if (alias) { \
             for (; slave < master->slaves + master->slave_count; \
                     slave++) { \
-                if (slave->sii.alias == alias) \
+                if (slave->effective_alias == alias) \
                 break; \
             } \
             if (slave == master->slaves + master->slave_count) \
@@ -2262,7 +2262,7 @@
     slave_info->product_code = slave->sii.product_code;
     slave_info->revision_number = slave->sii.revision_number;
     slave_info->serial_number = slave->sii.serial_number;
-    slave_info->alias = slave->sii.alias;
+    slave_info->alias = slave->effective_alias;
     slave_info->current_on_ebus = slave->sii.current_on_ebus;
     slave_info->al_state = slave->current_state;
     slave_info->error_flag = slave->error_flag;