Fixed bug where the buffer name would overflow