geo: Fixed #2
geo: Next is now correct in almost all cases