Handle label value '0' properly. Resolves #6376