Fix badges 2