Fixed next() and prev()