Annotation index bug fix