more badge fixing