diff --git a/src/htx.c b/src/htx.c
index bfd136f..8149259 100644
--- a/src/htx.c
+++ b/src/htx.c
@@ -406,15 +406,8 @@
 			offset -= sz;
 			continue;
 		}
-		if (type == HTX_BLK_DATA) {
-			htx_set_blk_value_len(blk, offset);
-			htx->data -= (sz - offset);
-
-			if (blk->addr+sz == htx->tail_addr)
-				htx->tail_addr -= offset;
-			else if (blk->addr+sz == htx->head_addr)
-				htx->head_addr -= offset;
-		}
+		if (type == HTX_BLK_DATA)
+			htx_change_blk_value_len(htx, blk, offset);
 		offset = 0;
 	}
 	while (blk)
@@ -522,14 +515,7 @@
 	/* Append data and update the block itself */
 	ptr = htx_get_blk_ptr(htx, tailblk);
 	memcpy(ptr+sz, data.ptr, len);
-	htx_set_blk_value_len(tailblk, sz+len);
-
-	/* Update HTTP message */
-	htx->data += len;
-	if (tailblk->addr+sz == htx->tail_addr)
-		htx->tail_addr += len;
-	else if (tailblk->addr+sz == htx->head_addr)
-		htx->head_addr += len;
+	htx_change_blk_value_len(htx, tailblk, sz+len);
 
 	if (data.len == len) {
 		blk = tailblk;
@@ -988,14 +974,7 @@
 	/* Append data and update the block itself */
 	ptr = htx_get_blk_ptr(htx, tailblk);
 	memcpy(ptr + sz, data.ptr, len);
-	htx_set_blk_value_len(tailblk, sz + len);
-
-	/* Update HTTP message */
-	htx->data += len;
-	if (tailblk->addr+sz == htx->tail_addr)
-		htx->tail_addr += len;
-	else if (tailblk->addr+sz == htx->head_addr)
-		htx->head_addr += len;
+	htx_change_blk_value_len(htx, tailblk, sz+len);
 
 	BUG_ON((int32_t)htx->tail_addr < 0);
 	BUG_ON((int32_t)htx->head_addr < 0);