removed buffer overrun