label fixing and fix for #9953