#357 labels fixes
merge