Fixed .next method