Try to be better about the buffer queue.