Alter .next to handle skipping the last step