Merge "Fix visitor" into main