Annotation plugins bug fix