Annotation plugin bug fix