Next and Has next fixes