Fix cur_span properly.