Visitor handling fixed