Label fix
Merge branch 'hotfix/Labels'