Fix for showAnnotations mode