Label bug fix