bugfix about flexibility with annotations