Try to fix bug with badges