Fix buffer queue.
Merge pull request #5097 from shenweip/patch-19

Fix buffer queue again.