Annotation bug fix