Fixing the label count. DEVELOPER-861