diff --git a/src/core/tcp_in.c b/src/core/tcp_in.c
index 7715d9e5..212f9c4d 100644
--- a/src/core/tcp_in.c
+++ b/src/core/tcp_in.c
@@ -712,8 +712,7 @@ tcp_receive(struct tcp_pcb *pcb)
       /* Update the send buffer space. */
       pcb->acked = ackno - pcb->lastack;
 
-      /* FIX: Data split over odd boundaries */
-      pcb->snd_buf += ((pcb->acked+1) & ~0x1); /* Even the send buffer */
+      pcb->snd_buf += pcb->acked;
 
       /* Reset the fast retransmit variables. */
       pcb->dupacks = 0;
diff --git a/src/core/tcp_out.c b/src/core/tcp_out.c
index f95fbae9..62982bd1 100644
--- a/src/core/tcp_out.c
+++ b/src/core/tcp_out.c
@@ -338,8 +338,7 @@ tcp_enqueue(struct tcp_pcb *pcb, void *arg, u16_t len,
   }
   pcb->snd_lbb += len;
 
-  /* FIX: Data split over odd boundaries */
-  pcb->snd_buf -= ((len+1) & ~0x1); /* Even the send buffer */
+  pcb->snd_buf -= len;
 
   /* update number of segments on the queues */
   pcb->snd_queuelen = queuelen;