diff --git a/src/Messaging/Streaming/MessageStreamer.php b/src/Messaging/Streaming/MessageStreamer.php
index 47ed27b..0869612 100644
--- a/src/Messaging/Streaming/MessageStreamer.php
+++ b/src/Messaging/Streaming/MessageStreamer.php
@@ -59,7 +59,7 @@ class MessageStreamer {
      * @param callable(FrameInterface)   $onControl
      * @return MessageInterface
      */
-    public function onData($data, $context, MessageInterface $message = null, callable $onMessage, callable $onControl = null) {
+    public function onData($data, MessageInterface $message = null, callable $onMessage, callable $onControl = null, $context = null) {
         $overflow = '';
 
         $onControl ?: $this->noop;
@@ -97,7 +97,7 @@ class MessageStreamer {
                 $overflow = $frame->extractOverflow();
 
                 if (strlen($overflow) > 0) {
-                    $message = $this->onData($overflow, $context, $message, $onMessage, $onControl);
+                    $message = $this->onData($overflow, $message, $onMessage, $onControl, $context);
                 }
 
                 return $message;
@@ -121,7 +121,7 @@ class MessageStreamer {
         }
 
         if (strlen($overflow) > 0) {
-            $this->onData($overflow, $context, $message, $onMessage, $onControl);
+            $this->onData($overflow, $message, $onMessage, $onControl, $context);
         }
 
         return $message;
diff --git a/tests/ab/startServer.php b/tests/ab/startServer.php
index b316323..2fa6f8c 100644
--- a/tests/ab/startServer.php
+++ b/tests/ab/startServer.php
@@ -33,7 +33,7 @@ $server->on('request', function (\React\Http\Request $request, \React\Http\Respo
 
     $msg = null;
     $request->on('data', function($data) use ($ms, $response, &$msg) {
-        $msg = $ms->onData($data, $response, $msg, function(MessageInterface $msg, \React\Http\Response $conn) {
+        $msg = $ms->onData($data, $msg, function(MessageInterface $msg, \React\Http\Response $conn) {
             $conn->write($msg->getContents());
         }, function(FrameInterface $frame, \React\Http\Response $conn) use ($ms) {
             switch ($frame->getOpCode()) {
@@ -44,7 +44,7 @@ $server->on('request', function (\React\Http\Request $request, \React\Http\Respo
                     $conn->write($ms->newFrame($frame->getPayload(), true, Frame::OP_PONG)->getContents());
                 break;
             }
-        });
+        }, $response);
     });
 });
 $socket->listen(9001, '0.0.0.0');