Fix another assert failure very similar to PR16651's test case. This