Merge pull request #1873 from rubenk/fix-duplicate-label_t