Fixing first visit bug