Fix for label names truncation