diff --git a/asyncqueue.c b/asyncqueue.c
index 0ab71e12..ebb93eef 100644
--- a/asyncqueue.c
+++ b/asyncqueue.c
@@ -58,6 +58,7 @@ struct __AsyncQueue {
   pNWTimer        nw_tmr;       /* NetWait timer handle */
   mkChannel*      pSock;        /* socket address */
   pAsyncProtocol  protocol;
+  void*           context;      /**< opaque caller queue context */
 };
 
 static pAsyncQueue queue_array[FD_SETSIZE];
@@ -303,9 +304,9 @@ static int MyCallback(void* context, int mode)
 
   if (mode & nwatch_read) {
     int iRet;
-    char reply[1];
+    char reply[100];
 
-    iRet = NETRead(self->pSock, reply, 1, 0);
+    iRet = NETRead(self->pSock, reply, 100, 0);
     if (iRet < 0) { /* EOF */
       iRet = AQ_Reconnect(self);
       if (iRet <= 0)
@@ -317,18 +318,31 @@ static int MyCallback(void* context, int mode)
     if (iRet == 0) { /* TODO: timeout or error */
       return 0;
     } else {
+      int nchars = iRet;
+      int i = 0;
       pAQ_Cmd myCmd = self->command_head;
       if (myCmd) {
-        iRet = self->protocol->handleInput(self->protocol, myCmd->tran, reply[0]);
-        if (iRet == 0 || iRet == AQU_POP_CMD) { /* end of command */
-          if (myCmd->tran->handleResponse)
-            myCmd->tran->handleResponse(myCmd->tran);
-          PopCommand(self);
+        for (i = 0; i < nchars; ++i) {
+          iRet = self->protocol->handleInput(self->protocol, myCmd->tran, reply[i]);
+          if (iRet == 0 || iRet == AQU_POP_CMD) { /* end of command */
+            if (myCmd->tran->handleResponse)
+              myCmd->tran->handleResponse(myCmd->tran);
+            PopCommand(self);
+            break;
+          }
+          else if (iRet < 0) {
+            SICSLogWrite("ERROR: Protocol error in AsyncQueue", eError);
+            /* TODO: error */
+            break;
+          }
+        }
+        if (i < nchars - 1) {
+            SICSLogWrite("ERROR: excess chars in AsyncQueue", eError);
+          /* TODO: handle unsolicited */
         }
-        else if (iRet < 0) /* TODO: error */
-          ;
       }
       else {
+            SICSLogWrite("ERROR: unsolicited input in AsyncQueue", eError);
         /* TODO: handle unsolicited input */
       }
     }
@@ -954,3 +968,18 @@ int AsyncUnitDestroy(pAsyncUnit unit)
   return 1;
 }
 
+void* AsyncUnitSetQueueContext(pAsyncUnit unit, void* cntx) {
+  void* hold;
+  assert(unit);
+  assert(unit->queue);
+  hold = unit->queue->context;
+  unit->queue->context = cntx;
+  return hold;
+}
+
+void* AsyncUnitGetQueueContext(pAsyncUnit unit) {
+  assert(unit);
+  assert(unit->queue);
+  return unit->queue->context;
+}
+