Fix label and label-class