Merge "Fix the false-alarm bug when we skip to the end, which should be OK."