Fix buffer list problem