Fixed next uri behaviour.