Abstract visitor fix