Fixed badges
Fixed badges