Fix on Annotation Popup