fixed badge serving issue