removed function duplicates
Merge branch 'hotfix/check_same_tag'