Trying to fix queuebuf bug, but still buggy
Merge