diff --git a/snap-server.cabal b/snap-server.cabal
--- a/snap-server.cabal
+++ b/snap-server.cabal
@@ -1,5 +1,5 @@
 name:           snap-server
-version:        0.2.5
+version:        0.2.6
 synopsis:       A fast, iteratee-based, epoll-enabled web server for the Snap Framework
 description:
   This is the first developer prerelease of the Snap framework.  Snap is a
diff --git a/src/Snap/Internal/Http/Parser.hs b/src/Snap/Internal/Http/Parser.hs
--- a/src/Snap/Internal/Http/Parser.hs
+++ b/src/Snap/Internal/Http/Parser.hs
@@ -116,7 +116,7 @@
 writeChunkedTransferEncoding _buf enum it = do
     i'    <- wrap it
     --(i,_) <- unsafeBufferIterateeWithBuffer buf i'
-    i <- bufferIteratee i'
+    (i,_) <- bufferIteratee i'
     enum i
 
   where
diff --git a/src/Snap/Internal/Http/Server.hs b/src/Snap/Internal/Http/Server.hs
--- a/src/Snap/Internal/Http/Server.hs
+++ b/src/Snap/Internal/Http/Server.hs
@@ -306,10 +306,10 @@
 
     -- (writeEnd, cancelBuffering) <-
     --     liftIO $ I.unsafeBufferIterateeWithBuffer ibuf writeEnd'
-    -- let killBuffer = writeIORef cancelBuffering True
 
-    writeEnd <- liftIO $ I.bufferIteratee writeEnd'
-    let killBuffer = return ()
+    (writeEnd, cancelBuffering) <- liftIO $ I.bufferIteratee writeEnd'
+    let killBuffer = writeIORef cancelBuffering True
+
 
     liftIO $ debug "Server.httpSession: entered"
     mreq  <- receiveRequest