Fix initial index for first visit