Fix a buffer overrun that was introduced in the splitting.