HCOLL-167 improved the buffer overflow support