Correct the buffer issue
Correct the buffer issue