small buffer size related fix