diff --git a/src/proto_http.c b/src/proto_http.c
index 4c78af8..943439c 100644
--- a/src/proto_http.c
+++ b/src/proto_http.c
@@ -2123,7 +2123,7 @@
 	 * against the correct length.
 	 */
 	bytes = 1;
-	ptr = buf->p;
+	ptr = b_ptr(buf, msg->next);
 	if (*ptr == '\r') {
 		bytes++;
 		ptr++;
@@ -2131,7 +2131,7 @@
 			ptr = buf->data;
 	}
 
-	if (bytes > buf->i)
+	if (msg->next + bytes > buf->i)
 		return 0;
 
 	if (*ptr != '\n') {
@@ -2143,7 +2143,8 @@
 	if (unlikely(ptr >= buf->data + buf->size))
 		ptr = buf->data;
 	/* prepare the CRLF to be forwarded (->sov) */
-	msg->sov = msg->next = bytes;
+	msg->sov  += bytes;
+	msg->next += bytes;
 	msg->msg_state = HTTP_MSG_CHUNK_SIZE;
 	return 1;
 }