Fixed select buffer and new buffer creation