May have fixed the buffer not being used properly