Fix Badge Management