Label display issue fix