Fix another bug with non-ascii device labels (#863064)