Final little fix to the buffer