Fixed a bug in the buffer.
Stuff...