Fix going over the pole: similar approach as around the world

Only this time it's easier. Going over the pole takes precedence over
going around the world, this seemed to work better.