[#58693970] Fixes problem with primary / secondary labels mismatched