Another buffers fix.