Fixing badges.. again.