bug fixes for annotation