diff --git a/Xi/exevents.c b/Xi/exevents.c
index ea9daa905..0df65791a 100644
--- a/Xi/exevents.c
+++ b/Xi/exevents.c
@@ -869,7 +869,7 @@ UpdateDeviceState(DeviceIntPtr device, DeviceEvent* event)
              * event being delivered through the slave first
              */
             for (sd = inputInfo.devices; sd; sd = sd->next) {
-                if (IsMaster(sd) || sd->u.master != device)
+                if (IsMaster(sd) || GetMaster(sd, MASTER_POINTER) != device)
                     continue;
                 if (!sd->button)
                     continue;