Fix next/prev methods