Annotation rendering bug fix