Fixing buffers