diff --git a/lib/modules/Protocols.pmod/HTTP.pmod/Query.pike b/lib/modules/Protocols.pmod/HTTP.pmod/Query.pike
index 1a88deea30568e53ad6aec01d8b183af5cbcecde..8c0f11bf9477fcac511881cf76f04cee3db9c2d6 100644
--- a/lib/modules/Protocols.pmod/HTTP.pmod/Query.pike
+++ b/lib/modules/Protocols.pmod/HTTP.pmod/Query.pike
@@ -525,7 +525,7 @@ string data()
    if (zero_type(len)) 
       l=0x7fffffff;
    else
-      l=len-strlen(buf)+4+strlen(headerbuf);
+      l=len-strlen(buf)+datapos;
    if (l>0 && con)
    {
       string s=con->read(l);