Fix buffers list mapping