Put buffer overrun fix in another place.