Fix possible buffer overrun