Badges fix