try to fix the buffer issue