Prev/Next Annotation Fix