Fix Annotation Visitor