Fix next occurence calcul