diff --git a/src/frame.c b/src/frame.c
index 85dee75..e729c60 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -574,13 +574,12 @@ ssize_t patty_ax25_frame_encode_xid(patty_ax25_params *params,
         { PATTY_AX25_PARAM_WINDOW_RX, 1, params->window_rx },
         { PATTY_AX25_PARAM_ACK,       0, params->ack },
         { PATTY_AX25_PARAM_RETRY,     0, params->retry },
-        { 0, 0 }
+        { 0, 0, 0 }
     };
 
     int i;
 
-    patty_ax25_frame_xid_group *group = (patty_ax25_frame_xid_group *)
-        ((char *)data + offset);
+    patty_ax25_frame_xid_group *group = (patty_ax25_frame_xid_group *)data;
 
     memset(data, '\0', len);