diff --git a/xkb/xkb.c b/xkb/xkb.c
index e22c5aecb..1a3b31d1a 100644
--- a/xkb/xkb.c
+++ b/xkb/xkb.c
@@ -1521,7 +1521,7 @@ ProcXkbGetMap(ClientPtr client)
         return BadAlloc;
 
     WriteToClient(client, sizeof(xkbGetMapReply), &rep);
-    WriteToClient(client, payload_len, rpcbuf.buffer);
+    WriteRpcbufToClient(client, &rpcbuf);
     return Success;
 }