Fixed /badges issue