diff --git a/Xi/xipassivegrab.c b/Xi/xipassivegrab.c
index b726bdf7b3..86d1e2a12b 100644
--- a/Xi/xipassivegrab.c
+++ b/Xi/xipassivegrab.c
@@ -68,9 +68,7 @@ ProcXIPassiveGrabDevice(ClientPtr client)
         ((uint32_t) stuff->mask_len + stuff->num_modifiers) *4);
 
     if (client->swapped) {
-        uint32_t *mods = (uint32_t *) &stuff[1] + stuff->mask_len;
-        for (int i = 0; i < stuff->num_modifiers; i++, mods++)
-            swapl(mods);
+        SwapLongs((CARD32*)&stuff[1], stuff->num_modifiers + stuff->mask_len);
     }
 
     DeviceIntPtr dev, mod_dev;