Corrected the label-setting