Fix potential buffer overrun