New labels and generate labels fixed
New labels and generate labels fixed