fixed up buffers