Add step-skip consistency check