Fix another small regression on next-header