diff --git a/iso14229.c b/iso14229.c
index 909ec65..9dd2970 100644
--- a/iso14229.c
+++ b/iso14229.c
@@ -195,7 +195,7 @@ static ssize_t tp_send(struct UDSTpHandle *hdl, const void *buf, size_t count,
 #endif
 
 #if UDS_TP == UDS_TP_LINUX_SOCKET
-static int LinuxSockBind(const char *if_name, uint16_t rxid, uint16_t txid) {
+static int LinuxSockBind(const char *if_name, uint32_t rxid, uint32_t txid) {
     int fd = 0;
     if ((fd = socket(AF_CAN, SOCK_DGRAM | SOCK_NONBLOCK, CAN_ISOTP)) < 0) {
         perror("Socket");
@@ -231,8 +231,8 @@ static int LinuxSockBind(const char *if_name, uint16_t rxid, uint16_t txid) {
     return fd;
 }
 
-static int LinuxSockTpOpen(UDSTpHandle_t *hdl, const char *if_name, uint16_t phys_rxid,
-                           uint16_t phys_txid, uint16_t func_rxid, uint16_t func_txid) {
+static int LinuxSockTpOpen(UDSTpHandle_t *hdl, const char *if_name, uint32_t phys_rxid,
+                           uint32_t phys_txid, uint32_t func_rxid, uint32_t func_txid) {
     assert(if_name);
     UDSTpLinuxIsoTp_t *impl = (UDSTpLinuxIsoTp_t *)hdl->impl;
     hdl->recv = tp_recv;
diff --git a/iso14229.h b/iso14229.h
index 8bac1cf..db403a0 100644
--- a/iso14229.h
+++ b/iso14229.h
@@ -335,14 +335,14 @@ typedef struct {
 #if UDS_TP == UDS_TP_CUSTOM
     UDSTpHandle_t *tp;
 #elif UDS_TP == UDS_TP_ISOTP_C
-    uint16_t phys_recv_id;
-    uint16_t phys_send_id;
-    uint16_t func_send_id;
+    uint32_t phys_recv_id;
+    uint32_t phys_send_id;
+    uint32_t func_send_id;
 #elif UDS_TP == UDS_TP_LINUX_SOCKET
     const char *if_name;
-    uint16_t phys_recv_id;
-    uint16_t phys_send_id;
-    uint16_t func_send_id;
+    uint32_t phys_recv_id;
+    uint32_t phys_send_id;
+    uint32_t func_send_id;
 #else
 #error "transport undefined"
 #endif
@@ -651,14 +651,14 @@ typedef struct {
 #if UDS_TP == UDS_TP_CUSTOM
     UDSTpHandle_t *tp;
 #elif UDS_TP == UDS_TP_ISOTP_C
-    uint16_t phys_send_id;
-    uint16_t phys_recv_id;
-    uint16_t func_recv_id;
+    uint32_t phys_send_id;
+    uint32_t phys_recv_id;
+    uint32_t func_recv_id;
 #elif UDS_TP == UDS_TP_LINUX_SOCKET
     const char *if_name;
-    uint16_t phys_send_id;
-    uint16_t phys_recv_id;
-    uint16_t func_recv_id;
+    uint32_t phys_send_id;
+    uint32_t phys_recv_id;
+    uint32_t func_recv_id;
 #else
 #error "transport undefined"
 #endif