fix bug introduce when refactoring annotation management