Really prevent the possible buffer overflow. This is getting silly.