Fixed the badge issues