Fix VisitService