fix/Possible buffer limit problem #29