Issue #65 extended to other enqueue methods with buffers