fix non annotated tags
Merge branch 'hotfix/tags'