Fix bug on badges