Fixed bug in Badges event