Fixed label count issue