Buffers now work as expected