Avoid index-out-of-range error
Stop shoehorning two disparate things together